mirror of
https://github.com/OpenTrespasser/JurassicParkTrespasser.git
synced 2024-12-24 01:21:57 +00:00
Compare commits
308 Commits
cdc57afed5
...
040c99d81b
Author | SHA1 | Date | |
---|---|---|---|
|
040c99d81b | ||
|
e3a96b0a61 | ||
|
3d6bfd84a8 | ||
|
60989db4e0 | ||
|
efed0232a0 | ||
|
a12019910a | ||
|
07720945e5 | ||
|
d86040138e | ||
|
907ee215da | ||
|
021b085a7e | ||
|
17fc4ee43c | ||
|
6d93cd5ba7 | ||
|
d9d69792bc | ||
|
c867006e81 | ||
|
5c8fa8ef21 | ||
|
6f70cd8eb5 | ||
|
0592f11b85 | ||
|
0502f4e61b | ||
|
528d459831 | ||
|
80fa882b9e | ||
|
8224666a3b | ||
|
6cfe6f438a | ||
|
65b1de902d | ||
|
c42f0aafed | ||
|
8041954104 | ||
|
70e781cf3e | ||
|
32de2df5e3 | ||
|
90dc0c0ff7 | ||
|
e29cd44fe4 | ||
|
47eaf6f3b9 | ||
|
73dba4a96f | ||
|
00b1eb36af | ||
|
b92ea8f6af | ||
|
dab46bd090 | ||
|
0e7e35356d | ||
|
a8fbcdf288 | ||
|
1602ec6abd | ||
|
d72509a633 | ||
|
3d99c0421b | ||
|
6143c57154 | ||
|
ec65f8429b | ||
|
e94e2d2974 | ||
|
1ccada1084 | ||
|
e4c9ecfa00 | ||
|
2158e15747 | ||
|
7fd1298397 | ||
|
c9f09aaefb | ||
|
9ed07cb839 | ||
|
d5d3e1f11f | ||
|
a95022254f | ||
|
5f41c72e53 | ||
|
7ed6eedb8f | ||
|
61b4c9e096 | ||
|
a0453efb68 | ||
|
b2b2d4beb0 | ||
|
8d4f14f022 | ||
|
e528f67f60 | ||
|
ca4a0754f1 | ||
|
9a3a1b2266 | ||
|
8a3ccc449a | ||
|
dc9c88ba51 | ||
|
a1dfb7d4fe | ||
|
887d09849e | ||
|
17927c3c77 | ||
|
f34c14d2d9 | ||
|
787e07d28f | ||
|
afbbc71fac | ||
|
9ebc15c181 | ||
|
c12c6e243e | ||
|
1cb261c80e | ||
|
f0e604a073 | ||
|
465fa44e85 | ||
|
b714106ada | ||
|
4a5c8ddf9b | ||
|
bd2c818d6e | ||
|
58a309081d | ||
|
31886b2725 | ||
|
40fe502d9f | ||
|
4a480bf918 | ||
|
70c4b2f0a8 | ||
|
aee3e014ea | ||
|
f7b97df272 | ||
|
e4bdb25f3d | ||
|
0c342fde0e | ||
|
ebad165169 | ||
|
c71cd4a1fd | ||
|
112f2d6157 | ||
|
00973bba29 | ||
|
5a04c11643 | ||
|
4494b65a6f | ||
|
0e0fb7b6fa | ||
|
cccd10b599 | ||
|
04eb378fff | ||
|
70b2b491f9 | ||
|
f1bc01ecbd | ||
|
0883a70540 | ||
|
f82c8d4b16 | ||
|
6416b9b602 | ||
|
7236a10a83 | ||
|
3a7c84d7ae | ||
|
3a584066dd | ||
|
e322fcb728 | ||
|
0d54f3960e | ||
|
03a08267bb | ||
|
970f696ff2 | ||
|
8abb05d1c0 | ||
|
84591a99de | ||
|
3886d10a6f | ||
|
4ab746f006 | ||
|
16a3f8e453 | ||
|
5ff754e184 | ||
|
c1292011c6 | ||
|
06451f30f9 | ||
|
103684f84d | ||
|
a10b604632 | ||
|
d7f7dfeb2d | ||
|
8542a67d7d | ||
|
917563076b | ||
|
eead470c0b | ||
|
469d309e73 | ||
|
ecf5d754e8 | ||
|
9c2d6f2943 | ||
|
039f46d196 | ||
|
72dbcc0448 | ||
|
340ce35797 | ||
|
d88f3fc10c | ||
|
4abd47b2db | ||
|
e7e6159745 | ||
|
3fb99d6934 | ||
|
2fb60c8a61 | ||
|
0c49c37262 | ||
|
0eecc3ea23 | ||
|
f90421f83d | ||
|
ecd0a6a84d | ||
|
fb07d7d460 | ||
|
bf0602ad74 | ||
|
c64d8e487f | ||
|
0166c45b28 | ||
|
7461c0dd87 | ||
|
48a3f1c108 | ||
|
f90ebde084 | ||
|
0181164169 | ||
|
93b6acc8dd | ||
|
a683ed546d | ||
|
1ab3d32868 | ||
|
8dc2f35167 | ||
|
bda5f9ebb1 | ||
|
86b7649006 | ||
|
b0476ec798 | ||
|
f187bb53e2 | ||
|
4d04ff2d0a | ||
|
3a1aceec25 | ||
|
cfed87615e | ||
|
4c11324dbf | ||
|
b7ed59cc5a | ||
|
fedbc7fad3 | ||
|
6947c24733 | ||
|
fc06ed92cb | ||
|
3208adf3a3 | ||
|
19e3f36e62 | ||
|
e1fcd70d9f | ||
|
a079598d72 | ||
|
7e401fe163 | ||
|
38889999e1 | ||
|
652a684f60 | ||
|
c67707e5b7 | ||
|
b926c85330 | ||
|
9c43118fe5 | ||
|
714ec61141 | ||
|
8dbc12272e | ||
|
1f70fe02ff | ||
|
854ea470a5 | ||
|
63d4d05a49 | ||
|
4580be1c9c | ||
|
2d790b40a7 | ||
|
edf33ed7a3 | ||
|
1489193917 | ||
|
033fe02bb2 | ||
|
c26bdc60a8 | ||
|
761e6cfffa | ||
|
6d6e8af3f1 | ||
|
0a4a954493 | ||
|
e99e4b2daf | ||
|
5cdab9a011 | ||
|
d6b2016072 | ||
|
e0354f878f | ||
|
eeda4610bc | ||
|
536c30316a | ||
|
c025c3b47c | ||
|
ac1a7c6bff | ||
|
48fc692d64 | ||
|
8532e34a65 | ||
|
01d1972737 | ||
|
c8e6309669 | ||
|
4a95d3eb04 | ||
|
65cc93d66a | ||
|
9c747d969c | ||
|
59f7823b95 | ||
|
d80290db44 | ||
|
5ec8678151 | ||
|
a45a69f91f | ||
|
ffa7e534ee | ||
|
72bb2674b2 | ||
|
43340905d8 | ||
|
f5ac192f67 | ||
|
3e3e52cdd4 | ||
|
1f0e986cdb | ||
|
a47eabbfce | ||
|
1997bb15e9 | ||
|
31ac680fab | ||
|
6bee71c2be | ||
|
38ca7e2b6a | ||
|
c34b2c41c9 | ||
|
1f3df5a27e | ||
|
ca04799386 | ||
|
8efb6e0fa3 | ||
|
64bb123a35 | ||
|
22cfe12384 | ||
|
d3b90c0c9d | ||
|
1238483671 | ||
|
bafcd09d05 | ||
|
554e8f7ebe | ||
|
22ff6a2257 | ||
|
4cc2ce2c34 | ||
|
55a24ecc1c | ||
|
3c9c859d26 | ||
|
fff4322a37 | ||
|
1cc54fd697 | ||
|
83951add25 | ||
|
0896eef3fb | ||
|
74c711e5ad | ||
|
c56d01630e | ||
|
0fe7e815cc | ||
|
5b146d52e0 | ||
|
82c5c4f4d5 | ||
|
e87560551a | ||
|
a0a28eb611 | ||
|
afcb8cb1a9 | ||
|
a285b42708 | ||
|
92f76ab717 | ||
|
20fb244d5c | ||
|
72445ca297 | ||
|
cb5b45e954 | ||
|
588330a1d4 | ||
|
03540124ab | ||
|
632e558e2b | ||
|
8eae76e6e0 | ||
|
fd3de18441 | ||
|
af49459dce | ||
|
b27192822a | ||
|
58dd4631c6 | ||
|
dc86186cfc | ||
|
df55cfcdb3 | ||
|
79a60a1b26 | ||
|
be8610365d | ||
|
3bb52d5543 | ||
|
7a08baa599 | ||
|
24e883084e | ||
|
48847f90f8 | ||
|
7755016327 | ||
|
9894237ced | ||
|
be720ebc5d | ||
|
bac45b5057 | ||
|
d75fa7c94e | ||
|
28fb7d2fb9 | ||
|
6180d618e8 | ||
|
9b4a98b1e1 | ||
|
c3694ed1d0 | ||
|
9abca39105 | ||
|
2f15734092 | ||
|
5d75425bea | ||
|
1c0366ee0b | ||
|
f1b961c325 | ||
|
031a22596d | ||
|
c1cacd6084 | ||
|
540e745b47 | ||
|
d9e2a40230 | ||
|
65089c672b | ||
|
1dee33070a | ||
|
f63be9d27b | ||
|
20afd0ec3f | ||
|
6da9a68369 | ||
|
1a6a242b56 | ||
|
985323794b | ||
|
a1fbdc2890 | ||
|
963efadd00 | ||
|
c6f1af620c | ||
|
016800edfb | ||
|
fd9697ba3d | ||
|
84e32351a2 | ||
|
fb43bbdb59 | ||
|
4eeadcc3f5 | ||
|
6db1c2745f | ||
|
184ed2147b | ||
|
07d1060fde | ||
|
189f016005 | ||
|
2f5dd2c1d0 | ||
|
b5ff507428 | ||
|
ff4a966893 | ||
|
ae3abdcf75 | ||
|
fca13ace54 | ||
|
7f5c7e49f6 | ||
|
83310949db | ||
|
d513a5f1e2 | ||
|
62baf26549 | ||
|
6e47528c42 | ||
|
d4df09730b | ||
|
b4d88be176 |
@ -42,6 +42,7 @@ include(cmake/CMakeCommon.cmake)
|
||||
|
||||
add_subdirectory(cmake/AI)
|
||||
add_subdirectory(cmake/AITest)
|
||||
add_subdirectory(cmake/AIUnitTest)
|
||||
add_subdirectory(cmake/Audio)
|
||||
add_subdirectory(cmake/AudioTest)
|
||||
add_subdirectory(cmake/Bugs)
|
||||
|
@ -1,3 +1,4 @@
|
||||
#pragma once
|
||||
|
||||
//**********************************************************************************************
|
||||
//
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
//**********************************************************************************************
|
||||
//
|
||||
// Following are example declarations for each type of item.
|
||||
|
@ -1,4 +1,6 @@
|
||||
//******************************************************************************************
|
||||
#pragma once
|
||||
|
||||
//******************************************************************************************
|
||||
//
|
||||
type tFunction
|
||||
(
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
//**********************************************************************************************
|
||||
//
|
||||
namespace (name)
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
//**********************************************************************************************
|
||||
//
|
||||
// Global definitions.
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
// AI Dialogs2Dlg.h : header file
|
||||
//
|
||||
|
||||
@ -26,7 +28,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CAIDialogs2Dlg)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
@ -35,11 +37,11 @@ protected:
|
||||
|
||||
// Generated message map functions
|
||||
//{{AFX_MSG(CAIDialogs2Dlg)
|
||||
virtual BOOL OnInitDialog();
|
||||
virtual BOOL OnInitDialog() override;
|
||||
afx_msg void OnPaint();
|
||||
afx_msg HCURSOR OnQueryDragIcon();
|
||||
virtual void OnOK();
|
||||
virtual void OnCancel();
|
||||
virtual void OnOK() override;
|
||||
virtual void OnCancel() override;
|
||||
afx_msg void OnAll();
|
||||
afx_msg void OnNone();
|
||||
afx_msg void OnDblclkActivities();
|
||||
|
@ -66,7 +66,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CBackground)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX);
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override;
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
protected:
|
||||
|
@ -60,7 +60,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CCameraProperties)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
protected:
|
||||
|
@ -57,7 +57,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogAlphaColour)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -85,7 +85,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogBumpPack)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
int32 i4PageSelect; // current selected bump map page or -1
|
||||
|
@ -63,7 +63,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogCulling)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -78,7 +78,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogDepthSort)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -57,7 +57,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogFog)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
protected:
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
// DialogGamma.hpp : header file
|
||||
//
|
||||
|
||||
@ -23,7 +25,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogGamma)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
@ -40,7 +42,7 @@ protected:
|
||||
afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
|
||||
afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
|
||||
afx_msg void OnClose();
|
||||
virtual void OnOK();
|
||||
virtual void OnOK() override;
|
||||
//}}AFX_MSG
|
||||
DECLARE_MESSAGE_MAP()
|
||||
};
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
// DialogGore.hpp : header file
|
||||
//
|
||||
|
||||
@ -22,7 +24,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogGore)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -62,7 +62,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogGun)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -50,8 +50,8 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogMagnet)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -53,7 +53,7 @@ protected:
|
||||
//
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void SetVal(T val)
|
||||
virtual void SetVal(T val) override
|
||||
//
|
||||
// Converts the angle (in degrees) to a cosine.
|
||||
//
|
||||
@ -62,7 +62,7 @@ protected:
|
||||
}
|
||||
|
||||
//******************************************************************************************
|
||||
virtual T tGetVal() const
|
||||
virtual T tGetVal() const override
|
||||
//
|
||||
// Converts the cosine to an angle (in degrees).
|
||||
//
|
||||
@ -109,7 +109,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogMaterial)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
@ -134,7 +134,7 @@ protected:
|
||||
//
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void Update(CController& ctrl);
|
||||
virtual void Update(CController& ctrl) override;
|
||||
};
|
||||
|
||||
|
||||
|
@ -59,7 +59,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogTexturePack)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
protected:
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
// DialogMipmap.hpp : header file
|
||||
//
|
||||
|
||||
@ -21,7 +23,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogMipmap)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -72,7 +72,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogObject)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
/**********************************************************************************************
|
||||
*
|
||||
* Copyright © DreamWorks Interactive, 1997.
|
||||
@ -45,7 +47,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogOcclusion)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -50,7 +50,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogPartition)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -143,14 +143,14 @@ public:
|
||||
}
|
||||
|
||||
//******************************************************************************************
|
||||
virtual float fGet() const
|
||||
virtual float fGet() const override
|
||||
{
|
||||
Assert(pfVar);
|
||||
return *pfVar;
|
||||
}
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void Set(float f)
|
||||
virtual void Set(float f) override
|
||||
{
|
||||
Assert(pfVar);
|
||||
*pfVar = f;
|
||||
@ -175,14 +175,14 @@ public:
|
||||
}
|
||||
|
||||
//******************************************************************************************
|
||||
virtual float fGet() const
|
||||
virtual float fGet() const override
|
||||
{
|
||||
Assert(pfVar);
|
||||
return pphibBox ? pphibBox->*pfVar : 0.0;
|
||||
}
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void Set(float f)
|
||||
virtual void Set(float f) override
|
||||
{
|
||||
Assert(pfVar);
|
||||
if (pphibBox)
|
||||
@ -207,7 +207,7 @@ public:
|
||||
}
|
||||
|
||||
//******************************************************************************************
|
||||
virtual float fGet() const
|
||||
virtual float fGet() const override
|
||||
{
|
||||
// Return calculated value.
|
||||
if (CItemFloatBox::pphibBox)
|
||||
@ -220,7 +220,7 @@ public:
|
||||
}
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void Set(float f)
|
||||
virtual void Set(float f) override
|
||||
{
|
||||
if (CItemFloatBox::pphibBox)
|
||||
{
|
||||
|
@ -113,7 +113,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogPhysics)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
protected:
|
||||
@ -137,9 +137,9 @@ protected:
|
||||
//{{AFX_MSG(CDialogPhysics)
|
||||
afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
|
||||
afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
|
||||
virtual void OnOK();
|
||||
virtual void OnOK() override;
|
||||
afx_msg void OnReset();
|
||||
virtual void OnCancel();
|
||||
virtual void OnCancel() override;
|
||||
//}}AFX_MSG
|
||||
DECLARE_MESSAGE_MAP()
|
||||
};
|
||||
|
@ -101,7 +101,7 @@ public:
|
||||
protected:
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
|
||||
// Implementation
|
||||
protected:
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
// DialogRenderCache.hpp : header file
|
||||
//
|
||||
|
||||
@ -38,7 +40,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogRenderCache)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
// DialogScheduler.hpp : header file
|
||||
//
|
||||
|
||||
@ -23,7 +25,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogScheduler)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -213,7 +213,7 @@ public:
|
||||
int i_steps = 100, // Number of discrete steps the scrollbar uses.
|
||||
int i_text_id = 0, // Associated static text control for display.
|
||||
CWnd* pwnd_dialog = 0 // Containing dialog.
|
||||
)
|
||||
) override
|
||||
//
|
||||
// Sets the scrollbar's internal values.
|
||||
//
|
||||
@ -244,7 +244,7 @@ public:
|
||||
(
|
||||
float f_current_value, // Current value of the parameter.
|
||||
CWnd* pwnd_dialog = 0 // Containing dialog.
|
||||
)
|
||||
) override
|
||||
//
|
||||
// Sets the scrollbar to the specified value.
|
||||
//
|
||||
@ -266,7 +266,7 @@ public:
|
||||
virtual float fGet
|
||||
(
|
||||
CWnd* pwnd_dialog = 0 // Containing dialog.
|
||||
)
|
||||
) override
|
||||
//
|
||||
// Gets the value specified by the scrollbar.
|
||||
//
|
||||
|
@ -79,7 +79,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogSky)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
protected:
|
||||
|
@ -166,7 +166,7 @@ public:
|
||||
void TestPlay(TSoundHandle sndhnd, bool b_loop);
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void OnOK();
|
||||
virtual void OnOK() override;
|
||||
|
||||
//*****************************************************************************************
|
||||
//
|
||||
@ -224,7 +224,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogSoundMaterial)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
//*****************************************************************************************
|
||||
|
@ -60,7 +60,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogString)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
protected:
|
||||
|
@ -32,9 +32,9 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogTeleport)
|
||||
public:
|
||||
virtual BOOL Create(LPCTSTR lpszClassName, LPCTSTR lpszWindowName, DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID, CCreateContext* pContext = NULL);
|
||||
virtual BOOL Create(LPCTSTR lpszClassName, LPCTSTR lpszWindowName, DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID, CCreateContext* pContext = NULL) override;
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
@ -42,7 +42,7 @@ protected:
|
||||
|
||||
// Generated message map functions
|
||||
//{{AFX_MSG(CDialogTeleport)
|
||||
virtual void OnOK();
|
||||
virtual void OnOK() override;
|
||||
//}}AFX_MSG
|
||||
DECLARE_MESSAGE_MAP()
|
||||
};
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
/**********************************************************************************************
|
||||
*
|
||||
* Copyright © DreamWorks Interactive, 1997.
|
||||
@ -94,7 +96,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogTerrain)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -62,7 +62,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogTexturePack)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
protected:
|
||||
|
@ -56,7 +56,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogTexturePackOptions)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
protected:
|
||||
|
@ -63,7 +63,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogVM)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
protected:
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
/**********************************************************************************************
|
||||
*
|
||||
* Copyright © DreamWorks Interactive, 1998.
|
||||
@ -52,7 +54,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogWater)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -435,7 +435,7 @@ public:
|
||||
|
||||
//*****************************************************************************************
|
||||
//
|
||||
BOOL OnInitDialog()
|
||||
BOOL OnInitDialog() override
|
||||
//
|
||||
// Set the version and date strings.
|
||||
//
|
||||
|
@ -69,8 +69,8 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CGUIAppApp)
|
||||
public:
|
||||
virtual BOOL InitInstance();
|
||||
virtual int ExitInstance();
|
||||
virtual BOOL InitInstance() override;
|
||||
virtual int ExitInstance() override;
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
//{{AFX_MSG(CGUIAppApp)
|
||||
|
@ -620,7 +620,7 @@ public:
|
||||
void Process
|
||||
(
|
||||
const CMessageNewRaster& msgnewr
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Processes CMessageNewRaster messages.
|
||||
//
|
||||
@ -738,12 +738,12 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CGUIAppDlg)
|
||||
public:
|
||||
virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo);
|
||||
virtual BOOL PreTranslateMessage(MSG* pMsg);
|
||||
virtual BOOL DestroyWindow();
|
||||
virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo) override;
|
||||
virtual BOOL PreTranslateMessage(MSG* pMsg) override;
|
||||
virtual BOOL DestroyWindow() override;
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual LRESULT DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam);
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
virtual LRESULT DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam) override;
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
|
||||
@ -816,10 +816,10 @@ protected:
|
||||
|
||||
// Overridden from CInstance...
|
||||
//*****************************************************************************************
|
||||
virtual char * pcSave(char * pc_buffer) const;
|
||||
virtual char * pcSave(char * pc_buffer) const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const char* pcLoad(const char* pc_buffer);
|
||||
virtual const char* pcLoad(const char* pc_buffer) override;
|
||||
|
||||
|
||||
|
||||
@ -852,7 +852,7 @@ protected:
|
||||
public:
|
||||
|
||||
//{{AFX_MSG(CGUIAppDlg)
|
||||
virtual BOOL OnInitDialog();
|
||||
virtual BOOL OnInitDialog() override;
|
||||
afx_msg void OnPaint();
|
||||
afx_msg HCURSOR OnQueryDragIcon();
|
||||
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
|
||||
|
@ -189,7 +189,7 @@ protected:
|
||||
//
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void DDX(CDataExchange* pDX)
|
||||
virtual void DDX(CDataExchange* pDX) override
|
||||
{
|
||||
::DDX_Control(pDX, iID, *this);
|
||||
Display();
|
||||
@ -204,7 +204,7 @@ protected:
|
||||
}
|
||||
*/
|
||||
//******************************************************************************************
|
||||
virtual BOOL OnChildNotify( UINT message, WPARAM wParam, LPARAM lParam, LRESULT* pLResult )
|
||||
virtual BOOL OnChildNotify( UINT message, WPARAM wParam, LPARAM lParam, LRESULT* pLResult ) override
|
||||
{
|
||||
// Dispatch messages.
|
||||
if (message == WM_NOTIFY)
|
||||
@ -230,7 +230,7 @@ protected:
|
||||
|
||||
//******************************************************************************************
|
||||
//
|
||||
virtual void Display() const
|
||||
virtual void Display() const override
|
||||
//
|
||||
// Display the current value.
|
||||
//
|
||||
@ -298,7 +298,7 @@ protected:
|
||||
//
|
||||
|
||||
//******************************************************************************************
|
||||
virtual BOOL OnDeltaPos( NM_UPDOWN* pNMUpDown )
|
||||
virtual BOOL OnDeltaPos( NM_UPDOWN* pNMUpDown ) override
|
||||
{
|
||||
//
|
||||
// Handle spinner control.
|
||||
@ -353,7 +353,7 @@ protected:
|
||||
}
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void Format(char str_text[]) const;
|
||||
virtual void Format(char str_text[]) const override;
|
||||
};
|
||||
|
||||
//******************************************************************************************
|
||||
@ -404,7 +404,7 @@ protected:
|
||||
//
|
||||
|
||||
//******************************************************************************************
|
||||
virtual BOOL OnDeltaPos( NM_UPDOWN* pNMUpDown )
|
||||
virtual BOOL OnDeltaPos( NM_UPDOWN* pNMUpDown ) override
|
||||
{
|
||||
if (MinMax == emmMIN)
|
||||
tMin = *ptVarClamp * tDisplayFactor;
|
||||
|
@ -83,7 +83,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CLightProperties)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
protected:
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
// ParameterDlg.h : header file
|
||||
//
|
||||
|
||||
@ -45,7 +47,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CParameterDlg)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
|
||||
@ -54,9 +56,9 @@ protected:
|
||||
|
||||
// Generated message map functions
|
||||
//{{AFX_MSG(CParameterDlg)
|
||||
virtual BOOL OnInitDialog();
|
||||
virtual void OnOK();
|
||||
virtual void OnCancel();
|
||||
virtual BOOL OnInitDialog() override;
|
||||
virtual void OnOK() override;
|
||||
virtual void OnCancel() override;
|
||||
afx_msg void OnPaint();
|
||||
afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
|
||||
afx_msg void OnChangeEditParameter();
|
||||
|
@ -63,7 +63,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CPerspectiveSubdivideDialog)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -52,7 +52,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogQuality)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
protected:
|
||||
|
@ -96,7 +96,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CDialogSoundProp)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
protected:
|
||||
|
@ -253,8 +253,8 @@ private:
|
||||
// Overrides.
|
||||
//
|
||||
|
||||
void Process(const CMessageStep&);
|
||||
void Process(const CMessagePaint& msgpaint);
|
||||
void Process(const CMessageStep&) override;
|
||||
void Process(const CMessagePaint& msgpaint) override;
|
||||
};
|
||||
|
||||
|
||||
|
@ -77,7 +77,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CTool)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
protected:
|
||||
|
@ -1,3 +1,4 @@
|
||||
#pragma once
|
||||
//{{NO_DEPENDENCIES}}
|
||||
// Microsoft Developer Studio generated include file.
|
||||
// Used by GUIApp.rc
|
||||
|
@ -201,7 +201,7 @@ public:
|
||||
(
|
||||
int i_parent,
|
||||
int i_successor_maybe
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Returns true if the second arg is a successor of the first.
|
||||
//
|
||||
@ -749,7 +749,7 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void RemoveNode(int i_node_index);
|
||||
virtual void RemoveNode(int i_node_index) override;
|
||||
|
||||
//*********************************************************************************
|
||||
//
|
||||
@ -757,7 +757,7 @@ public:
|
||||
(
|
||||
int i_parent,
|
||||
int i_successor_maybe
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Returns true if the second arg is a successor of the first.
|
||||
//
|
||||
@ -770,7 +770,7 @@ public:
|
||||
virtual void AddNode
|
||||
(
|
||||
CAIGraphNode& node
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Adds a node to the graph.
|
||||
//
|
||||
|
@ -654,7 +654,7 @@ public:
|
||||
virtual void Process
|
||||
(
|
||||
const CMessageStep& ms
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Runs the AI system for one cycle.
|
||||
//
|
||||
@ -672,7 +672,7 @@ public:
|
||||
|
||||
//*********************************************************************************************
|
||||
//
|
||||
virtual void Process(const CMessagePaint& msgpaint);
|
||||
virtual void Process(const CMessagePaint& msgpaint) override;
|
||||
//
|
||||
// Draws any AI debugging info.
|
||||
//
|
||||
@ -680,10 +680,10 @@ public:
|
||||
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual char * pcSave(char * pc_buffer) const;
|
||||
virtual char * pcSave(char * pc_buffer) const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const char * pcLoad(const char * pc_buffer);
|
||||
virtual const char * pcLoad(const char * pc_buffer) override;
|
||||
|
||||
|
||||
|
||||
|
@ -1045,13 +1045,13 @@ public:
|
||||
(
|
||||
const CFeeling& feel, // The feeling used to evaluate the action.
|
||||
CInfluence* pinf // The direct object of the action.
|
||||
);
|
||||
) override;
|
||||
//
|
||||
//******************************
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
@ -152,7 +152,7 @@ public:
|
||||
(
|
||||
const CFeeling& feel, // The feeling used to evaluate the action.
|
||||
CInfluence* pinf // The direct object of the action.
|
||||
);
|
||||
) override;
|
||||
//
|
||||
//******************************
|
||||
|
||||
@ -162,7 +162,7 @@ public:
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Bite the influence.
|
||||
//
|
||||
@ -170,7 +170,7 @@ public:
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
|
||||
};
|
||||
@ -213,7 +213,7 @@ public:
|
||||
(
|
||||
const CFeeling& feel, // The feeling used to evaluate the action.
|
||||
CInfluence* pinf // The direct object of the action.
|
||||
);
|
||||
) override;
|
||||
//
|
||||
//******************************
|
||||
|
||||
@ -223,7 +223,7 @@ public:
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Claw the influence.
|
||||
//
|
||||
@ -231,7 +231,7 @@ public:
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
|
||||
};
|
||||
@ -267,14 +267,14 @@ public:
|
||||
//
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void MaybeSetTargetLock(CInfluence *pinf);
|
||||
virtual void MaybeSetTargetLock(CInfluence *pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
|
||||
};
|
||||
@ -318,7 +318,7 @@ public:
|
||||
(
|
||||
const CFeeling& feel, // The feeling used to evaluate the action.
|
||||
CInfluence* pinf // The direct object of the action.
|
||||
);
|
||||
) override;
|
||||
//
|
||||
//******************************
|
||||
|
||||
@ -328,7 +328,7 @@ public:
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Ram.
|
||||
//
|
||||
@ -349,7 +349,7 @@ public:
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
|
||||
};
|
||||
@ -392,27 +392,27 @@ public:
|
||||
//
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void Start(CInfluence* pinf);
|
||||
virtual void Start(CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void DoPhaseOne(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void DoPhaseOne(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void DoPhaseTwo(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void DoPhaseTwo(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void DoPhaseThree(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void DoPhaseThree(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void DoPhaseFour(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void DoPhaseFour(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -455,30 +455,30 @@ public:
|
||||
//
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void Start(CInfluence* pinf);
|
||||
virtual void Start(CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void Stop(CInfluence* pinf);
|
||||
virtual void Stop(CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void DoPhaseOne(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void DoPhaseOne(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void DoPhaseTwo(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void DoPhaseTwo(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void DoPhaseThree(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void DoPhaseThree(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void DoPhaseFour(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void DoPhaseFour(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
|
||||
};
|
||||
@ -530,7 +530,7 @@ public:
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Jump at foe and bite them as you get near.
|
||||
//
|
||||
@ -538,7 +538,7 @@ public:
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
|
||||
};
|
||||
@ -589,7 +589,7 @@ public:
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Jump on foe and stomp/claw them.
|
||||
//
|
||||
@ -597,7 +597,7 @@ public:
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -627,7 +627,7 @@ public:
|
||||
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void SetHeadPoint(CInfluence* pinf);
|
||||
virtual void SetHeadPoint(CInfluence* pinf) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
//
|
||||
@ -636,7 +636,7 @@ public:
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -673,26 +673,26 @@ public:
|
||||
//
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void Start();
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void DoPhaseOne(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void DoPhaseOne(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void DoPhaseTwo(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void DoPhaseTwo(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void DoPhaseThree(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void DoPhaseThree(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void DoPhaseFour(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void DoPhaseFour(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -740,7 +740,7 @@ public:
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Grab target with mouth.
|
||||
//
|
||||
@ -748,7 +748,7 @@ public:
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -797,7 +797,7 @@ public:
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Only works when Grabbing- throw thing held in your mouth.
|
||||
//
|
||||
@ -805,7 +805,7 @@ public:
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -853,7 +853,7 @@ public:
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Shake the thing held in your mouth, much as a dog does.
|
||||
//
|
||||
@ -861,7 +861,7 @@ public:
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
@ -158,7 +158,7 @@ public:
|
||||
(
|
||||
CRating, //rt_importance, // The importance of the activity.
|
||||
CInfluence* //pinf // The direct object of the action.
|
||||
)
|
||||
) override
|
||||
//
|
||||
//
|
||||
// Notes:
|
||||
@ -202,7 +202,7 @@ public:
|
||||
//
|
||||
virtual void ResetTempFlags
|
||||
(
|
||||
);
|
||||
) override;
|
||||
//
|
||||
//******************************
|
||||
|
||||
@ -212,7 +212,7 @@ public:
|
||||
(
|
||||
const CFeeling& feel, // The feeling used to evaluate the action.
|
||||
CInfluence* pinf // The direct object of the action.
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Rates and Registers the activity with the synthesizer.
|
||||
//
|
||||
@ -228,7 +228,7 @@ public:
|
||||
(
|
||||
const CFeeling& feel, // The emotional state used to evaluate the action.
|
||||
CInfluenceList* pinfl // All influences known.
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Rates and Registers the activity with the synthesizer.
|
||||
//
|
||||
@ -292,7 +292,7 @@ public:
|
||||
(
|
||||
const CFeeling& feel_self, // How the animal feels inside.
|
||||
CInfluence* pinf // What influence we are analyzing.
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Notes:
|
||||
// The CActivityDOSubBrain performs a bunch of internal processing on the
|
||||
@ -309,7 +309,7 @@ public:
|
||||
(
|
||||
const CFeeling& feel_self, // How the animal feels inside.
|
||||
CInfluence* pinf // What influence we are analyzing.
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Notes:
|
||||
// Uses an adjusted feeling to determine the sub-activities ratings.
|
||||
@ -393,7 +393,7 @@ public:
|
||||
(
|
||||
const CFeeling& feel, // The feeling used to evaluate the action.
|
||||
CInfluence* pinf // The direct object of the action.
|
||||
);
|
||||
) override;
|
||||
//
|
||||
//******************************
|
||||
|
||||
@ -403,7 +403,7 @@ public:
|
||||
(
|
||||
const CFeeling& feel, // The emotional state used to evaluate the action.
|
||||
CInfluenceList* pinfl // All influences known.
|
||||
);
|
||||
) override;
|
||||
//
|
||||
//******************************
|
||||
};
|
||||
@ -473,7 +473,7 @@ public:
|
||||
(
|
||||
const CFeeling& feel, // The feeling used to evaluate the action.
|
||||
CInfluence* pinf // The direct object of the action.
|
||||
);
|
||||
) override;
|
||||
//
|
||||
//******************************
|
||||
|
||||
@ -483,7 +483,7 @@ public:
|
||||
(
|
||||
const CFeeling& feel, // The emotional state used to evaluate the action.
|
||||
CInfluenceList* pinfl // All influences known.
|
||||
);
|
||||
) override;
|
||||
//
|
||||
//******************************
|
||||
};
|
||||
|
@ -153,7 +153,7 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
};
|
||||
|
||||
|
@ -122,14 +122,14 @@ public:
|
||||
//
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -166,10 +166,10 @@ public:
|
||||
//
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
};
|
||||
|
||||
@ -211,7 +211,7 @@ public:
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
|
||||
};
|
||||
|
||||
@ -248,10 +248,10 @@ public:
|
||||
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
};
|
||||
|
||||
@ -287,10 +287,10 @@ public:
|
||||
//
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
};
|
||||
|
||||
@ -329,7 +329,7 @@ public:
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
|
||||
};
|
||||
|
||||
@ -368,14 +368,14 @@ public:
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate
|
||||
(
|
||||
const CFeeling& feel, // The feeling used to evaluate the action.
|
||||
CInfluence* pinf // The direct object of the action.
|
||||
);
|
||||
) override;
|
||||
};
|
||||
|
||||
|
||||
|
@ -69,11 +69,11 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -109,14 +109,14 @@ public:
|
||||
//
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -150,11 +150,11 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -189,14 +189,14 @@ public:
|
||||
//
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -229,11 +229,11 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -266,11 +266,11 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -303,11 +303,11 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -340,11 +340,11 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -377,14 +377,14 @@ public:
|
||||
//
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
@ -100,11 +100,11 @@ public:
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -142,11 +142,11 @@ public:
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -183,11 +183,11 @@ public:
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -222,11 +222,11 @@ public:
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -257,18 +257,18 @@ public:
|
||||
//
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -304,18 +304,18 @@ public:
|
||||
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act
|
||||
(
|
||||
CRating rt_importance,
|
||||
CInfluence* pinf
|
||||
);
|
||||
) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -350,14 +350,14 @@ public:
|
||||
//
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
@ -136,7 +136,7 @@ public:
|
||||
CInstance* const pinsTarget; // The object associated with this influence
|
||||
// or 0 if none.
|
||||
|
||||
CSet<EInfluenceFlag>setFlags; // A bunch of flags for an influence.
|
||||
mutable CSet<EInfluenceFlag> setFlags; // A bunch of flags for an influence.
|
||||
|
||||
// CFeeling feelDBGWeighted; // The emotional baggage associated with the influence,
|
||||
|
||||
@ -277,7 +277,7 @@ public:
|
||||
virtual int iAddToGraph
|
||||
(
|
||||
CBrain* pbr // Brain to which this influence belongs.
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Adds nodes to the pathfinding graph based on shape of the target.
|
||||
//
|
||||
@ -317,7 +317,7 @@ public:
|
||||
//
|
||||
virtual void CalculateNodeSuitability
|
||||
(
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Decides how important the influence is for node construction (pathfinding).
|
||||
//
|
||||
@ -327,7 +327,7 @@ public:
|
||||
//
|
||||
virtual TReal rRateNodeSuitability
|
||||
(
|
||||
) const;
|
||||
) const override;
|
||||
//
|
||||
// Decided how important the influence is right now (based on rNodeSuitability).
|
||||
//
|
||||
@ -352,7 +352,7 @@ public:
|
||||
//
|
||||
void ResetTemporaryFlags
|
||||
(
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Resets the flags which are short-lived.
|
||||
//
|
||||
@ -415,6 +415,10 @@ public:
|
||||
// return (CInfluence)*this;
|
||||
// }
|
||||
|
||||
static bool IsDiscardable(const CInfluence& influence)
|
||||
{
|
||||
return influence.setFlags[eifIS_DISCARDABLE];
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
@ -97,14 +97,14 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -143,14 +143,14 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -186,14 +186,14 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -234,14 +234,14 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -277,11 +277,11 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -313,14 +313,14 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -356,14 +356,14 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual CRating rtRate( const CFeeling& feel,CInfluence* pinf);
|
||||
virtual CRating rtRate( const CFeeling& feel,CInfluence* pinf) override;
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -403,20 +403,20 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual CRating rtRate( const CFeeling& feel,CInfluence* pinf);
|
||||
virtual CRating rtRate( const CFeeling& feel,CInfluence* pinf) override;
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual char * pcSave(char * pc_buffer) const;
|
||||
virtual char * pcSave(char * pc_buffer) const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const char * pcLoad(const char * pc_buffer);
|
||||
virtual const char * pcLoad(const char * pc_buffer) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -456,20 +456,20 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual CRating rtRate( const CFeeling& feel,CInfluence* pinf);
|
||||
virtual CRating rtRate( const CFeeling& feel,CInfluence* pinf) override;
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual char * pcSave(char * pc_buffer) const;
|
||||
virtual char * pcSave(char * pc_buffer) const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const char * pcLoad(const char * pc_buffer);
|
||||
virtual const char * pcLoad(const char * pc_buffer) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -505,14 +505,14 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -548,14 +548,14 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -596,14 +596,14 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -641,14 +641,14 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -684,14 +684,14 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -729,14 +729,14 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -772,14 +772,14 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -826,17 +826,17 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
|
||||
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void Activate(bool b_active_state);
|
||||
virtual void Activate(bool b_active_state) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
@ -276,7 +276,7 @@ public:
|
||||
(
|
||||
CAIGraph*, //paig, // The graph the node is in.
|
||||
int //i_node_index // The index of the node.
|
||||
)
|
||||
) override
|
||||
//
|
||||
//******************************
|
||||
{
|
||||
@ -289,7 +289,7 @@ public:
|
||||
(
|
||||
CAIGraphNode*, //paig, // The node to update.
|
||||
TSec //s_when_used // The time the node was used.
|
||||
)
|
||||
) override
|
||||
//
|
||||
//******************************
|
||||
{
|
||||
@ -298,7 +298,7 @@ public:
|
||||
//
|
||||
// Cast functions.
|
||||
//
|
||||
virtual CNHStart* pCastNHStart() { return this; };
|
||||
virtual CNHStart* pCastNHStart() override { return this; };
|
||||
};
|
||||
|
||||
//*********************************************************************************************
|
||||
@ -333,7 +333,7 @@ public:
|
||||
(
|
||||
CAIGraph*, //paig, // The graph the node is in.
|
||||
int //i_node_index // The index of the node.
|
||||
)
|
||||
) override
|
||||
//
|
||||
// Examines aign to determine its importance.
|
||||
//
|
||||
@ -352,7 +352,7 @@ public:
|
||||
(
|
||||
CAIGraphNode*, //paig, // The node to update.
|
||||
TSec //s_when_used // The time the node was used.
|
||||
)
|
||||
) override
|
||||
//
|
||||
//******************************
|
||||
{
|
||||
@ -362,7 +362,7 @@ public:
|
||||
// Cast functions.
|
||||
//
|
||||
|
||||
virtual CNHStop* pCastNHStop() { return this; };
|
||||
virtual CNHStop* pCastNHStop() override { return this; };
|
||||
|
||||
};
|
||||
|
||||
@ -402,7 +402,7 @@ public:
|
||||
(
|
||||
CAIGraph*, //paig, // The graph the node is in.
|
||||
int //i_node_index // The index of the node.
|
||||
);
|
||||
) override;
|
||||
//******************************
|
||||
|
||||
//*************************************************************************************
|
||||
@ -411,7 +411,7 @@ public:
|
||||
(
|
||||
CAIGraph* paig, // The graph the node is in.
|
||||
int i_node_index // The index of the node.
|
||||
);
|
||||
) override;
|
||||
//******************************
|
||||
|
||||
//*************************************************************************************
|
||||
@ -420,16 +420,16 @@ public:
|
||||
(
|
||||
CAIGraphNode* paig, // The node to update.
|
||||
TSec s_when_used // The time the node was used.
|
||||
);
|
||||
) override;
|
||||
//******************************
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CNodeSource* pnsReferences();
|
||||
virtual CNodeSource* pnsReferences() override;
|
||||
|
||||
//
|
||||
// Cast functions.
|
||||
//
|
||||
virtual CNHNodeSource* pCastNHNodeSource() { return this; };
|
||||
virtual CNHNodeSource* pCastNHNodeSource() override { return this; };
|
||||
};
|
||||
|
||||
#ifdef TRACK_OLD_NODES
|
||||
@ -532,7 +532,7 @@ public:
|
||||
(
|
||||
CAIGraph*, //paig, // The graph the node is in.
|
||||
int //i_node_index // The index of the node.
|
||||
);
|
||||
) override;
|
||||
//******************************
|
||||
|
||||
//*************************************************************************************
|
||||
@ -541,7 +541,7 @@ public:
|
||||
(
|
||||
CAIGraph* paig, // The graph the node is in.
|
||||
int i_node_index // The index of the node.
|
||||
);
|
||||
) override;
|
||||
//******************************
|
||||
|
||||
//*************************************************************************************
|
||||
@ -550,7 +550,7 @@ public:
|
||||
(
|
||||
CAIGraphNode* paig, // The node to update.
|
||||
TSec s_when_used // The time the node was used.
|
||||
);
|
||||
) override;
|
||||
//******************************
|
||||
|
||||
//*************************************************************************************
|
||||
@ -558,15 +558,15 @@ public:
|
||||
virtual bool bReferences
|
||||
(
|
||||
const CInstance* pins
|
||||
) const;
|
||||
) const override;
|
||||
//******************************
|
||||
|
||||
//*************************************************************************************
|
||||
virtual CNodeSource* pnsReferences();
|
||||
virtual CNodeSource* pnsReferences() override;
|
||||
//
|
||||
// Cast functions.
|
||||
//
|
||||
virtual CNHInfluence* pCastNHInfluence() { return this; };
|
||||
virtual CNHInfluence* pCastNHInfluence() override { return this; };
|
||||
};
|
||||
|
||||
#ifdef TRACK_OLD_NODES
|
||||
@ -676,7 +676,7 @@ public:
|
||||
(
|
||||
CAIGraph*, //paig, // The graph the node is in.
|
||||
int //i_node_index // The index of the node.
|
||||
);
|
||||
) override;
|
||||
//******************************
|
||||
|
||||
//*************************************************************************************
|
||||
@ -685,10 +685,10 @@ public:
|
||||
(
|
||||
CAIGraph* paig, // The graph the node is in.
|
||||
int i_node_index // The index of the node.
|
||||
);
|
||||
) override;
|
||||
//******************************
|
||||
|
||||
virtual CNHInfluenceSurface*pCastNHInfluenceSurface() { return this; };
|
||||
virtual CNHInfluenceSurface*pCastNHInfluenceSurface() override { return this; };
|
||||
|
||||
};
|
||||
|
||||
@ -719,15 +719,15 @@ public:
|
||||
//
|
||||
|
||||
//*************************************************************************************
|
||||
virtual float fRate(CAIGraph* paig, int i_node_index);
|
||||
virtual float fRate(CAIGraph* paig, int i_node_index) override;
|
||||
|
||||
//*************************************************************************************
|
||||
virtual void Delete(CAIGraph* paig, int i_node_index);
|
||||
virtual void Delete(CAIGraph* paig, int i_node_index) override;
|
||||
|
||||
//
|
||||
// Cast functions.
|
||||
//
|
||||
virtual CNHRandom* pCastNHRandom() { return this; };
|
||||
virtual CNHRandom* pCastNHRandom() override { return this; };
|
||||
};
|
||||
|
||||
//*********************************************************************************************
|
||||
@ -762,7 +762,7 @@ public:
|
||||
(
|
||||
CAIGraph* paig, // The graph the node is in.
|
||||
int i_node_index // The index of the node.
|
||||
)
|
||||
) override
|
||||
//
|
||||
// Examines aign to determine its importance.
|
||||
//
|
||||
@ -784,7 +784,7 @@ public:
|
||||
(
|
||||
CAIGraph* paig, // The graph the node is in.
|
||||
int i_node_index // The index of the node.
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Updates any external data structs that need it when a node is deleted.
|
||||
//
|
||||
@ -795,7 +795,7 @@ public:
|
||||
//
|
||||
// Cast functions.
|
||||
//
|
||||
virtual CNHDesigner* pCastNHDesigner() { return this; };
|
||||
virtual CNHDesigner* pCastNHDesigner() override { return this; };
|
||||
};
|
||||
|
||||
//*********************************************************************************************
|
||||
@ -826,14 +826,14 @@ public:
|
||||
(
|
||||
CAIGraph*, //paig, // The graph the node is in.
|
||||
int //i_node_index // The index of the node.
|
||||
);
|
||||
) override;
|
||||
//******************************
|
||||
|
||||
//
|
||||
// Cast functions.
|
||||
//
|
||||
|
||||
virtual CNHUnknown* pCastNHUnknown() { return this; };
|
||||
virtual CNHUnknown* pCastNHUnknown() override { return this; };
|
||||
};
|
||||
|
||||
//*********************************************************************************************
|
||||
@ -866,7 +866,7 @@ public:
|
||||
// Cast functions.
|
||||
//
|
||||
|
||||
virtual CNHInvalid* pCastNHInvalid() { return this; };
|
||||
virtual CNHInvalid* pCastNHInvalid() override { return this; };
|
||||
};
|
||||
|
||||
#define ENTRY(type, name) char name [sizeof(type)]
|
||||
|
@ -108,7 +108,7 @@ public:
|
||||
CPath* ppath,
|
||||
CRating rt_solidity, // The max solidity through which the dino will go
|
||||
TReal r_close_enough // Accept a path bringing you this close to destination
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Notes:
|
||||
// Assumes that the influence list is up to date, including target distaces,
|
||||
@ -128,7 +128,7 @@ public:
|
||||
CVector2<> v2_direction, // Direction of travel.
|
||||
CPath* ppath, // The path to be filled by the pathfinder.
|
||||
CRating rt_solidity // The max solidity through which the dino will go
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Fills "ppath" with a path leading in the general direction "v2_direction".
|
||||
//
|
||||
|
@ -25,9 +25,9 @@
|
||||
*
|
||||
**********************************************************************************************/
|
||||
|
||||
#if 0
|
||||
#ifndef HEADER_GAME_AI_PATHAVOIDER_HPP
|
||||
#define HEADER_GAME_AI_PATHAVOIDER_HPP
|
||||
#if 0
|
||||
|
||||
#include "Pathfinder.hpp"
|
||||
|
||||
|
@ -21,9 +21,9 @@
|
||||
*
|
||||
**********************************************************************************************/
|
||||
|
||||
#if 0
|
||||
#ifndef HEADER_GAME_AI_PATHFAILURE_HPP
|
||||
#define HEADER_GAME_AI_PATHFAILURE_HPP
|
||||
#if 0
|
||||
|
||||
class CFailureObstacle;
|
||||
#include "Pathfinder.hpp"
|
||||
|
@ -81,7 +81,7 @@ public:
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
|
||||
};
|
||||
@ -123,11 +123,11 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -163,11 +163,11 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -201,11 +201,11 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -243,11 +243,11 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -284,11 +284,11 @@ public:
|
||||
//
|
||||
|
||||
//*********************************************************************************
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf);
|
||||
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
@ -367,56 +367,38 @@ void CWorldView::RemoveSomeInfluences()
|
||||
// unimportant enough, go ahead.
|
||||
|
||||
// If we have a bunch of influences, remove one.
|
||||
CInfluenceList::iterator pinf_lowest = inflInfluences.end();
|
||||
CInfluenceList::iterator pinf = inflInfluences.begin();
|
||||
size_t discardable = 0;
|
||||
|
||||
int i_discardable_count = 0;
|
||||
std::list<const CInfluence*> lpinf_discard;
|
||||
CInstance* lowestInstance = nullptr;
|
||||
std::list<CInstance*> todelete;
|
||||
|
||||
// Find the lamest influence and remove it.
|
||||
// For now, we only remove one bad apple each cycle.
|
||||
for (; pinf != inflInfluences.end(); pinf++)
|
||||
for (const auto& entry : inflInfluences)
|
||||
{
|
||||
TReal r_importance = (*pinf).rImportance;
|
||||
|
||||
if (gaiSystem.sNow - (*pinf).sLastSeen > paniOwner->pbrBrain->sForgetInfluence)
|
||||
if (gaiSystem.sNow - entry.sLastSeen > paniOwner->pbrBrain->sForgetInfluence)
|
||||
entry.setFlags[eifIS_DISCARDABLE] = true;
|
||||
else if (entry.rImportance < r_lowest)
|
||||
{
|
||||
// It's been a while. Forget me, please.
|
||||
((CInfluence*)&(*pinf))->setFlags[eifIS_DISCARDABLE] = true;
|
||||
}
|
||||
else if ( r_importance < r_lowest)
|
||||
{
|
||||
r_lowest = r_importance;
|
||||
pinf_lowest = pinf;
|
||||
r_lowest = entry.rImportance;
|
||||
lowestInstance = entry.pinsTarget;
|
||||
}
|
||||
|
||||
if ((*pinf).setFlags[eifIS_DISCARDABLE])
|
||||
if (entry.setFlags[eifIS_DISCARDABLE])
|
||||
{
|
||||
// Add to discard list!
|
||||
lpinf_discard.push_back(&(*pinf));
|
||||
++i_discardable_count;
|
||||
todelete.push_back(entry.pinsTarget);
|
||||
discardable++;
|
||||
}
|
||||
}
|
||||
|
||||
if (pinf_lowest != inflInfluences.end())
|
||||
if (lowestInstance)
|
||||
{
|
||||
// Add to discard list!
|
||||
lpinf_discard.push_back(&(*pinf_lowest));
|
||||
((CInfluence*)&(*pinf_lowest))->setFlags[eifIS_DISCARDABLE] = true;
|
||||
//Influence set is based on instance pointers, find result is guaranteed to be the correct one
|
||||
iterFindInfluence(lowestInstance)->setFlags[eifIS_DISCARDABLE] = true;
|
||||
todelete.push_back(lowestInstance);
|
||||
}
|
||||
|
||||
if (i_discardable_count > 10)
|
||||
{
|
||||
std::list<const CInfluence*>::iterator itpinf;
|
||||
for(itpinf = lpinf_discard.begin(); itpinf != lpinf_discard.end(); ++itpinf)
|
||||
{
|
||||
// Is it discardable?
|
||||
Assert((*itpinf)->setFlags[eifIS_DISCARDABLE]);
|
||||
|
||||
// Discard it.
|
||||
bRemoveInfluence((*itpinf)->pinsTarget);
|
||||
}
|
||||
}
|
||||
if (discardable > 10)
|
||||
for (auto* entry : todelete)
|
||||
bRemoveInfluence(entry);
|
||||
}
|
||||
|
||||
//*********************************************************************************
|
||||
|
@ -122,13 +122,13 @@ public:
|
||||
//
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void Process(const CMessageSystem& ms);
|
||||
virtual void Process(const CMessageSystem& ms) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual char * pcSave(char * pc_buffer) const;
|
||||
virtual char * pcSave(char * pc_buffer) const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const char * pcLoad(const char * pc_buffer);
|
||||
virtual const char * pcLoad(const char * pc_buffer) override;
|
||||
};
|
||||
|
||||
// Single global instance.
|
||||
|
@ -178,7 +178,7 @@ public:
|
||||
// Overrides.
|
||||
//
|
||||
|
||||
void Process(const CMessagePaint& msgpaint);
|
||||
void Process(const CMessagePaint& msgpaint) override;
|
||||
};
|
||||
|
||||
// Single global instance.
|
||||
|
@ -158,36 +158,36 @@ public:
|
||||
//
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual bool bUse(bool b_repeat);
|
||||
virtual bool bUse(bool b_repeat) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void PickedUp();
|
||||
virtual void PickedUp() override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Process(const CMessageMove& msg);
|
||||
virtual void Process(const CMessageMove& msg) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Process(const CMessageStep& msg);
|
||||
virtual void Process(const CMessageStep& msg) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual CInstance* pinsCopy() const;
|
||||
virtual CInstance* pinsCopy() const override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Cast(CGun** ppgun)
|
||||
virtual void Cast(CGun** ppgun) override
|
||||
{
|
||||
*ppgun = this;
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual char * pcSave(char * pc_buffer) const;
|
||||
virtual char * pcSave(char * pc_buffer) const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const char * pcLoad(const char * pc_buffer);
|
||||
virtual const char * pcLoad(const char * pc_buffer) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
// Return true if all referenced names are loaded, otherwise return false to prevent the
|
||||
@ -236,7 +236,7 @@ public:
|
||||
static void ResetMuzzleFlash();
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual bool bCanHaveChildren();
|
||||
virtual bool bCanHaveChildren() override;
|
||||
|
||||
// CInstance* pinsCopy() const;
|
||||
|
||||
|
@ -1246,7 +1246,7 @@ private:
|
||||
const CHandle& h_object, // handle of object in value table.
|
||||
CValueTable* pvtable, // Value Table.
|
||||
const CInfo* pinfo // The info to copy. Create a new one if 0.
|
||||
)
|
||||
) override
|
||||
{
|
||||
// Woo. Hellish.
|
||||
Assert(!pinfo);
|
||||
@ -1371,7 +1371,7 @@ private:
|
||||
const CHandle& h_object, // handle of object in value table.
|
||||
CValueTable* pvtable, // Value Table.
|
||||
const CInfo* pinfo // The info to copy. Create a new one if 0.
|
||||
)
|
||||
) override
|
||||
{
|
||||
|
||||
#define PARSE_SAMPLE_SET(ss)\
|
||||
@ -1593,13 +1593,13 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual CInstance* pinsHeldObject() const
|
||||
virtual CInstance* pinsHeldObject() const override
|
||||
{
|
||||
return bWithin(eHandHolding, ehhHOLDING, ehhDROPPING) ? pinsHeld : 0;
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual bool bHandInteract(const CInstance* pins) const
|
||||
virtual bool bHandInteract(const CInstance* pins) const override
|
||||
{
|
||||
if (eHandActivity == ehaINACTIVE && eHandHolding < ehhHOLDING)
|
||||
// Hand is inactive, and thus interacts with NOTHING, do you hear?
|
||||
@ -1614,7 +1614,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void MaybeTalkAboutAmmo(int i_current, int i_max)
|
||||
virtual void MaybeTalkAboutAmmo(int i_current, int i_max) override
|
||||
{
|
||||
// Bad, Bad, Bad, No negative ammo counts please.
|
||||
if (i_current < 0)
|
||||
@ -1641,7 +1641,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void TalkAboutApproximateAmmo(int i_sample)
|
||||
virtual void TalkAboutApproximateAmmo(int i_sample) override
|
||||
{
|
||||
// ALWAYS say approximates, because they happen so rarely.
|
||||
|
||||
@ -1670,7 +1670,7 @@ private:
|
||||
int i_current,
|
||||
int i_maximum,
|
||||
bool b_approximate
|
||||
)
|
||||
) override
|
||||
{
|
||||
// Bad, Bad, Bad, No negative ammo counts please.
|
||||
if (i_current < 0)
|
||||
@ -1731,7 +1731,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual bool bCanTalk()
|
||||
virtual bool bCanTalk() override
|
||||
{
|
||||
// Is Anne already speaking?
|
||||
Assert(padAudioDaemon);
|
||||
@ -1746,7 +1746,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void StopTalking()
|
||||
virtual void StopTalking() override
|
||||
{
|
||||
// Kill all voiceovers and music.
|
||||
AlwaysAssert(padAudioDaemon);
|
||||
@ -1764,13 +1764,13 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void JumpSound()
|
||||
virtual void JumpSound() override
|
||||
{
|
||||
Say(&ssJump);
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Pickup(CInstance* pins_obj)
|
||||
virtual void Pickup(CInstance* pins_obj) override
|
||||
{
|
||||
// If there is a preference, set the hand mesh.
|
||||
// Must be done before magneting, so new hand box takes effect.
|
||||
@ -1814,7 +1814,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Drop(CVector3<> v3_throw = v3Zero)
|
||||
virtual void Drop(CVector3<> v3_throw = v3Zero) override
|
||||
{
|
||||
// See if we're holding.
|
||||
if (!bWithin(eHandHolding, ehhHOLDING, ehhDROPPING))
|
||||
@ -1883,7 +1883,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void CheckForDrop()
|
||||
virtual void CheckForDrop() override
|
||||
{
|
||||
// See if we're holding.
|
||||
if (!PlayerSettings.bAllowDrop)
|
||||
@ -1926,7 +1926,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void DrawPhysics(CDraw& draw, CCamera& cam) const
|
||||
virtual void DrawPhysics(CDraw& draw, CCamera& cam) const override
|
||||
{
|
||||
#if bVER_BONES()
|
||||
CTransform3<> tf3_screen = cam.tf3ToHomogeneousScreen();
|
||||
@ -1972,13 +1972,13 @@ private:
|
||||
//
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual bool bIncludeInBuildPart() const
|
||||
virtual bool bIncludeInBuildPart() const override
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void HandleDamage(float f_damage, const CInstance* pins_aggressor, const CInstance* pins_me)
|
||||
virtual void HandleDamage(float f_damage, const CInstance* pins_aggressor, const CInstance* pins_me) override
|
||||
{
|
||||
// What were my hit points before?
|
||||
Assert(fMaxHitPoints > 0.0f);
|
||||
@ -2086,7 +2086,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual float fWieldDamage(const CInstance* pins_weapon, float f_coll_damage) const
|
||||
virtual float fWieldDamage(const CInstance* pins_weapon, float f_coll_damage) const override
|
||||
{
|
||||
if (iSwinging == 2)
|
||||
f_coll_damage *= PlayerSettings.fSwingDamageMul;
|
||||
@ -2094,7 +2094,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Substitute(int i_sub)
|
||||
virtual void Substitute(int i_sub) override
|
||||
{
|
||||
// Save our requested substitution.
|
||||
// Actually perform the substitution next control message.
|
||||
@ -2107,7 +2107,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual CPlacement3<> p3HeadPlacement() const
|
||||
virtual CPlacement3<> p3HeadPlacement() const override
|
||||
{
|
||||
return p3Head;
|
||||
}
|
||||
@ -2118,7 +2118,7 @@ private:
|
||||
//
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void Move(const CPlacement3<>& p3_new, CEntity* pet_sender)
|
||||
virtual void Move(const CPlacement3<>& p3_new, CEntity* pet_sender) override
|
||||
{
|
||||
if (pet_sender == pphSystem)
|
||||
{
|
||||
@ -2223,7 +2223,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Process(const CMessageSystem& msgsys)
|
||||
virtual void Process(const CMessageSystem& msgsys) override
|
||||
{
|
||||
if (msgsys.escCode == escSTOP_SIM)
|
||||
{
|
||||
@ -2240,7 +2240,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Process(const CMessageStep& msgstep)
|
||||
virtual void Process(const CMessageStep& msgstep) override
|
||||
{
|
||||
// Invoke base class message handling.
|
||||
CAnimate::Process(msgstep);
|
||||
@ -2334,7 +2334,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Process(const CMessageControl& msgc)
|
||||
virtual void Process(const CMessageControl& msgc) override
|
||||
{
|
||||
bool b_use = false;
|
||||
|
||||
@ -3108,7 +3108,7 @@ private:
|
||||
}
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void Process(const CMessageCollision& msgcoll)
|
||||
virtual void Process(const CMessageCollision& msgcoll) override
|
||||
{
|
||||
CTimeBlock tmb(&psCollisionMsgPlayer);
|
||||
|
||||
@ -3197,7 +3197,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Process(const CMessagePhysicsReq& msgpr)
|
||||
virtual void Process(const CMessagePhysicsReq& msgpr) override
|
||||
{
|
||||
if (!bPhysics)
|
||||
return;
|
||||
@ -3237,7 +3237,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Process(const CMessageMove& msgmv)
|
||||
virtual void Process(const CMessageMove& msgmv) override
|
||||
{
|
||||
CTimeBlock tmb(&psMoveMsgPlayer);
|
||||
|
||||
@ -3269,7 +3269,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual char* pcSave(char* pc) const
|
||||
virtual char* pcSave(char* pc) const override
|
||||
{
|
||||
// Save the instance location data.
|
||||
pc = CAnimate::pcSave(pc);
|
||||
@ -3316,7 +3316,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const char* pcLoad(const char* pc)
|
||||
virtual const char* pcLoad(const char* pc) override
|
||||
{
|
||||
pc = CAnimate::pcLoad(pc);
|
||||
|
||||
@ -3388,7 +3388,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Cast(CPlayer** ppplay)
|
||||
virtual void Cast(CPlayer** ppplay) override
|
||||
{
|
||||
*ppplay = this;
|
||||
}
|
||||
@ -3397,7 +3397,7 @@ private:
|
||||
//
|
||||
virtual const char* strPartType
|
||||
(
|
||||
) const
|
||||
) const override
|
||||
//
|
||||
// Returns a partition type string.
|
||||
//
|
||||
@ -3407,7 +3407,7 @@ private:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void InitializeDataStatic()
|
||||
virtual void InitializeDataStatic() override
|
||||
{
|
||||
SetFlagHardwareAble(true);
|
||||
CPartition::InitializeDataStatic();
|
||||
|
@ -85,16 +85,16 @@ public:
|
||||
//
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual bool bUse(bool b_repeat);
|
||||
virtual bool bUse(bool b_repeat) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void PickedUp();
|
||||
virtual void PickedUp() override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual CInstance* pinsCopy() const;
|
||||
virtual CInstance* pinsCopy() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Cast(CSocket** psock)
|
||||
virtual void Cast(CSocket** psock) override
|
||||
{
|
||||
*psock = this;
|
||||
}
|
||||
@ -102,7 +102,7 @@ public:
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
@ -62,7 +62,7 @@ public:
|
||||
virtual ~CMultiWnd() {;}
|
||||
|
||||
protected:
|
||||
virtual LRESULT BaseHandler(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
virtual LRESULT BaseHandler(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) override;
|
||||
};
|
||||
|
||||
|
||||
@ -83,10 +83,10 @@ public:
|
||||
virtual void OnOK();
|
||||
|
||||
protected:
|
||||
virtual LRESULT BaseHandler(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
virtual LRESULT BaseHandler(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) override;
|
||||
|
||||
virtual void OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify);
|
||||
virtual BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam);
|
||||
virtual void OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) override;
|
||||
virtual BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam) override;
|
||||
};
|
||||
|
||||
|
||||
|
@ -63,13 +63,13 @@ public:
|
||||
HWND m_hwndList;
|
||||
|
||||
protected:
|
||||
void OnClose(HWND hwnd);
|
||||
void OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify);
|
||||
void OnDestroy(HWND hwnd);
|
||||
BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam);
|
||||
LRESULT OnNotify(HWND hwnd, int idCtrl, LPNMHDR pnmhdr);
|
||||
void OnParentNotify(HWND hwnd, UINT msg, HWND hwndChild, int idChild);
|
||||
void OnDropFiles(HWND hwnd, HDROP hdrop);
|
||||
void OnClose(HWND hwnd) override;
|
||||
void OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) override;
|
||||
void OnDestroy(HWND hwnd) override;
|
||||
BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam) override;
|
||||
LRESULT OnNotify(HWND hwnd, int idCtrl, LPNMHDR pnmhdr) override;
|
||||
void OnParentNotify(HWND hwnd, UINT msg, HWND hwndChild, int idChild) override;
|
||||
void OnDropFiles(HWND hwnd, HDROP hdrop) override;
|
||||
};
|
||||
|
||||
|
||||
@ -85,8 +85,8 @@ public:
|
||||
std::vector<GBUILD> m_vGBuild;
|
||||
|
||||
protected:
|
||||
void OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify);
|
||||
BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam);
|
||||
void OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) override;
|
||||
BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam) override;
|
||||
};
|
||||
|
||||
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
// InitGUIApp.h : main header file for the INITGUIAPP application
|
||||
//
|
||||
|
||||
@ -21,7 +23,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CInitGUIAppApp)
|
||||
public:
|
||||
virtual BOOL InitInstance();
|
||||
virtual BOOL InitInstance() override;
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -40,7 +40,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CAboutDlg)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
// InitGUIAppDlg.h : header file
|
||||
//
|
||||
|
||||
@ -25,7 +27,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CInitGUIAppDlg)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
@ -39,11 +41,11 @@ protected:
|
||||
|
||||
// Generated message map functions
|
||||
//{{AFX_MSG(CInitGUIAppDlg)
|
||||
virtual BOOL OnInitDialog();
|
||||
virtual BOOL OnInitDialog() override;
|
||||
afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
|
||||
afx_msg void OnPaint();
|
||||
afx_msg HCURSOR OnQueryDragIcon();
|
||||
virtual void OnOK();
|
||||
virtual void OnOK() override;
|
||||
afx_msg void OnSelchangeComboVideoguid();
|
||||
afx_msg void OnSelchangeComboD3d();
|
||||
afx_msg void OnSelchangeListCard();
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
//{{NO_DEPENDENCIES}}
|
||||
// Microsoft Developer Studio generated include file.
|
||||
// Used by InitGUIApp.rc
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
// stdafx.h : include file for standard system include files,
|
||||
// or project specific include files that are used frequently, but
|
||||
// are changed infrequently
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
// InitGUIApp2.h : main header file for the INITGUIAPP2 application
|
||||
//
|
||||
|
||||
@ -21,7 +23,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CInitGUIApp2App)
|
||||
public:
|
||||
virtual BOOL InitInstance();
|
||||
virtual BOOL InitInstance() override;
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
// InitGUIApp2Dlg.h : header file
|
||||
//
|
||||
|
||||
@ -20,7 +22,7 @@ public:
|
||||
// ClassWizard generated virtual function overrides
|
||||
//{{AFX_VIRTUAL(CInitGUIApp2Dlg)
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
|
||||
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
|
||||
//}}AFX_VIRTUAL
|
||||
|
||||
// Implementation
|
||||
@ -29,10 +31,10 @@ protected:
|
||||
|
||||
// Generated message map functions
|
||||
//{{AFX_MSG(CInitGUIApp2Dlg)
|
||||
virtual BOOL OnInitDialog();
|
||||
virtual BOOL OnInitDialog() override;
|
||||
afx_msg void OnPaint();
|
||||
afx_msg HCURSOR OnQueryDragIcon();
|
||||
virtual void OnOK();
|
||||
virtual void OnOK() override;
|
||||
afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
|
||||
afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
|
||||
afx_msg void OnCheckStuffChildren();
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
//{{NO_DEPENDENCIES}}
|
||||
// Microsoft Developer Studio generated include file.
|
||||
// Used by InitGUIApp2.rc
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
// stdafx.h : include file for standard system include files,
|
||||
// or project specific include files that are used frequently, but
|
||||
// are changed infrequently
|
||||
|
@ -103,37 +103,37 @@ protected:
|
||||
//
|
||||
// Output Mono 8 Bit data, the u4_byte count will be a multiple of 1
|
||||
//
|
||||
virtual uint32 u4DecompressMono8bit(uint8* pu1_dst, uint32 u4_byte_count);
|
||||
virtual uint32 u4DecompressMono8bit(uint8* pu1_dst, uint32 u4_byte_count) override;
|
||||
|
||||
|
||||
//******************************************************************************************
|
||||
// Output Mono 16 Bit data, the u4_byte count will be a multiple of 2
|
||||
// Returns the number of bytes put into the output buffer
|
||||
//
|
||||
virtual uint32 u4DecompressMono16bit(uint8* pu1_dst, uint32 u4_byte_count);
|
||||
virtual uint32 u4DecompressMono16bit(uint8* pu1_dst, uint32 u4_byte_count) override;
|
||||
|
||||
//******************************************************************************************
|
||||
// Output Stereo 8 Bit data, the u4_byte count will be a multiple of 2
|
||||
// Returns the number of bytes put into the output buffer
|
||||
//
|
||||
virtual uint32 u4DecompressStereo8bit(uint8* pu1_dst, uint32 u4_byte_count);
|
||||
virtual uint32 u4DecompressStereo8bit(uint8* pu1_dst, uint32 u4_byte_count) override;
|
||||
|
||||
//******************************************************************************************
|
||||
// Output Stereo 16 Bit data, the u4_byte count will be a multiple of 4
|
||||
// Returns the number of bytes put into the output buffer
|
||||
//
|
||||
virtual uint32 u4DecompressStereo16bit(uint8* pu1_dst, uint32 u4_byte_count);
|
||||
virtual uint32 u4DecompressStereo16bit(uint8* pu1_dst, uint32 u4_byte_count) override;
|
||||
|
||||
//******************************************************************************************
|
||||
// Set the base address and size of the current block that is avaliable for decompressing
|
||||
// Returns the number of bytes put into the output buffer
|
||||
//
|
||||
virtual void SetSampleSource(uint8* pu1_src, uint32 u4_src_len);
|
||||
virtual void SetSampleSource(uint8* pu1_src, uint32 u4_src_len) override;
|
||||
|
||||
//******************************************************************************************
|
||||
// get the number of bytes remaining in the current block, or 0 if none.
|
||||
//
|
||||
virtual uint32 u4GetRemainingData();
|
||||
virtual uint32 u4GetRemainingData() override;
|
||||
};
|
||||
|
||||
|
||||
|
@ -361,17 +361,17 @@ public:
|
||||
//******************************************************************************************
|
||||
// The messages that we respond to.
|
||||
//
|
||||
void Process(const CMessageStep& msg_step);
|
||||
void Process(const CMessageMove& msg);
|
||||
void Process(const CMessageCollision& msg);
|
||||
void Process(const CMessageAudio& msg_audio);
|
||||
void Process(const CMessageSystem& msg);
|
||||
void Process(const CMessageStep& msg_step) override;
|
||||
void Process(const CMessageMove& msg) override;
|
||||
void Process(const CMessageCollision& msg) override;
|
||||
void Process(const CMessageAudio& msg_audio) override;
|
||||
void Process(const CMessageSystem& msg) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
char* pcSave(char* pc) const;
|
||||
char* pcSave(char* pc) const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
const char* pcLoad(const char* pc);
|
||||
const char* pcLoad(const char* pc) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
char *pcSaveSample
|
||||
@ -390,7 +390,7 @@ public:
|
||||
|
||||
//*****************************************************************************************
|
||||
//
|
||||
void SaveDefaults();
|
||||
void SaveDefaults() override;
|
||||
//
|
||||
// Save the default values of the user modifiable settings.
|
||||
//
|
||||
@ -398,7 +398,7 @@ public:
|
||||
|
||||
//*****************************************************************************************
|
||||
//
|
||||
void RestoreDefaults();
|
||||
void RestoreDefaults() override;
|
||||
//
|
||||
// Restore the default values of the user modifiable settings.
|
||||
//
|
||||
|
@ -90,7 +90,7 @@ protected:
|
||||
//
|
||||
// Output Mono 8 Bit data, the u4_byte count will be a multiple of 1
|
||||
//
|
||||
virtual uint32 u4DecompressMono8bit(uint8* pu1_dst, uint32 u4_byte_count)
|
||||
virtual uint32 u4DecompressMono8bit(uint8* pu1_dst, uint32 u4_byte_count) override
|
||||
{
|
||||
uint32 u4_bytes;
|
||||
|
||||
@ -109,7 +109,7 @@ protected:
|
||||
// Output Mono 16 Bit data, the u4_byte count will be a multiple of 2
|
||||
// Returns the number of bytes put into the output buffer
|
||||
//
|
||||
virtual uint32 u4DecompressMono16bit(uint8* pu1_dst, uint32 u4_byte_count)
|
||||
virtual uint32 u4DecompressMono16bit(uint8* pu1_dst, uint32 u4_byte_count) override
|
||||
{
|
||||
uint32 u4_bytes;
|
||||
|
||||
@ -128,7 +128,7 @@ protected:
|
||||
// Output Stereo 8 Bit data, the u4_byte count will be a multiple of 2
|
||||
// Returns the number of bytes put into the output buffer
|
||||
//
|
||||
virtual uint32 u4DecompressStereo8bit(uint8* pu1_dst, uint32 u4_byte_count)
|
||||
virtual uint32 u4DecompressStereo8bit(uint8* pu1_dst, uint32 u4_byte_count) override
|
||||
{
|
||||
uint32 u4_bytes;
|
||||
|
||||
@ -147,7 +147,7 @@ protected:
|
||||
// Output Stereo 16 Bit data, the u4_byte count will be a multiple of 4
|
||||
// Returns the number of bytes put into the output buffer
|
||||
//
|
||||
virtual uint32 u4DecompressStereo16bit(uint8* pu1_dst, uint32 u4_byte_count)
|
||||
virtual uint32 u4DecompressStereo16bit(uint8* pu1_dst, uint32 u4_byte_count) override
|
||||
{
|
||||
uint32 u4_bytes;
|
||||
|
||||
@ -166,7 +166,7 @@ protected:
|
||||
// Set the base address and size of the current block that is avaliable for decompressing
|
||||
// Returns the number of bytes put into the output buffer
|
||||
//
|
||||
virtual void SetSampleSource(uint8* pu1_src, uint32 u4_src_len)
|
||||
virtual void SetSampleSource(uint8* pu1_src, uint32 u4_src_len) override
|
||||
{
|
||||
pu1SourceData = pu1_src;
|
||||
u4SourceDataSize = u4_src_len;
|
||||
@ -175,7 +175,7 @@ protected:
|
||||
//******************************************************************************************
|
||||
// get the number of bytes remaining in the current block, or 0 if none.
|
||||
//
|
||||
virtual uint32 u4GetRemainingData()
|
||||
virtual uint32 u4GetRemainingData() override
|
||||
{
|
||||
return u4SourceDataSize;
|
||||
}
|
||||
|
@ -193,8 +193,8 @@ public:
|
||||
//
|
||||
// Message that we need to process
|
||||
//
|
||||
void Process(const CMessageStep& msg_step);
|
||||
void Process(const CMessageSystem& msg_system);
|
||||
void Process(const CMessageStep& msg_step) override;
|
||||
void Process(const CMessageSystem& msg_system) override;
|
||||
|
||||
// start and stop input capture, initial state is not captured
|
||||
void Capture(bool b_state = true);
|
||||
|
@ -193,14 +193,14 @@ public:
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual char * pcSave(char * pc_buffer) const;
|
||||
virtual char * pcSave(char * pc_buffer) const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const char * pcLoad(const char * pc_buffer);
|
||||
virtual const char * pcLoad(const char * pc_buffer) override;
|
||||
|
||||
|
||||
//
|
||||
@ -211,56 +211,56 @@ public:
|
||||
virtual void PreRender
|
||||
(
|
||||
CRenderContext& renc // Target, camera, settings, etc.
|
||||
);
|
||||
) override;
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void Process
|
||||
(
|
||||
const CMessagePhysicsReq& msgpr
|
||||
);
|
||||
) override;
|
||||
|
||||
//lint -save -e1411
|
||||
//******************************************************************************************
|
||||
virtual void Process
|
||||
(
|
||||
const CMessageCollision& msgcoll
|
||||
);
|
||||
) override;
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void Process
|
||||
(
|
||||
const CMessageMove& msgmv
|
||||
);
|
||||
) override;
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void Process
|
||||
(
|
||||
const CMessageDelete& msgdel
|
||||
);
|
||||
) override;
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void Process
|
||||
(
|
||||
const CMessageDeath& msgdeath
|
||||
);
|
||||
) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void HandleDamage
|
||||
(
|
||||
float f_damage, const CInstance* pins_aggressor = 0, const CInstance* pins_me = 0
|
||||
);
|
||||
) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual CInstance* pinsCopy
|
||||
(
|
||||
) const; // Makes a copy of this
|
||||
) const override; // Makes a copy of this
|
||||
|
||||
//
|
||||
// Identifier functions.
|
||||
//
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Cast(CAnimal** ppani)
|
||||
virtual void Cast(CAnimal** ppani) override
|
||||
{
|
||||
*ppani = this;
|
||||
}
|
||||
|
@ -296,7 +296,7 @@ public:
|
||||
//
|
||||
virtual bool bCanHaveChildren
|
||||
(
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Returns 'false.'
|
||||
//
|
||||
@ -430,27 +430,27 @@ public:
|
||||
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual int iGetTeam() const;
|
||||
virtual int iGetTeam() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const CAnimate* paniGetOwner() const;
|
||||
virtual const CAnimate* paniGetOwner() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const CBoundVol* pbvBoundingVol() const;
|
||||
virtual const CBoundVol* pbvBoundingVol() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual CInstance* pinsCopy() const;
|
||||
virtual CInstance* pinsCopy() const override;
|
||||
|
||||
#if VER_TEST
|
||||
//*****************************************************************************************
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length);
|
||||
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
|
||||
#endif
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual char * pcSave(char * pc_buffer) const;
|
||||
virtual char * pcSave(char * pc_buffer) const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const char * pcLoad(const char * pc_buffer);
|
||||
virtual const char * pcLoad(const char * pc_buffer) override;
|
||||
|
||||
//
|
||||
// Message processing overrides.
|
||||
@ -461,31 +461,31 @@ public:
|
||||
(
|
||||
const CPlacement3<>& p3_new,
|
||||
CEntity* pet_sender = 0
|
||||
);
|
||||
) override;
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void Process
|
||||
(
|
||||
const CMessagePhysicsReq& msgpr
|
||||
);
|
||||
) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Process
|
||||
(
|
||||
const CMessageCollision& msgcoll // A collision event.
|
||||
);
|
||||
) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void PreRender
|
||||
(
|
||||
CRenderContext& renc // Target, camera, settings, etc.
|
||||
);
|
||||
) override;
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void Process
|
||||
(
|
||||
const CMessageStep& msgstep
|
||||
);
|
||||
) override;
|
||||
|
||||
//
|
||||
// Identifier functions.
|
||||
@ -493,7 +493,7 @@ public:
|
||||
|
||||
//*****************************************************************************************
|
||||
//lint -save -e1411
|
||||
virtual void Cast(CAnimate** ppant)
|
||||
virtual void Cast(CAnimate** ppant) override
|
||||
{
|
||||
*ppant = this;
|
||||
}
|
||||
@ -589,15 +589,15 @@ public:
|
||||
//
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual int iGetTeam() const;
|
||||
virtual int iGetTeam() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const CAnimate* paniGetOwner() const;
|
||||
virtual const CAnimate* paniGetOwner() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual CInstance* pinsCopy() const;
|
||||
virtual CInstance* pinsCopy() const override;
|
||||
|
||||
virtual void Cast(CBoundaryBox** ppbb)
|
||||
virtual void Cast(CBoundaryBox** ppbb) override
|
||||
{
|
||||
*ppbb = this;
|
||||
}
|
||||
|
@ -255,13 +255,13 @@ public:
|
||||
//
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Process(const CMessageStep&);
|
||||
virtual void Process(const CMessageStep&) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual char * pcSave(char * pc_buffer) const;
|
||||
virtual char * pcSave(char * pc_buffer) const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const char * pcLoad(const char * pc_buffer);
|
||||
virtual const char * pcLoad(const char * pc_buffer) override;
|
||||
};
|
||||
|
||||
// Single global instance.
|
||||
|
@ -83,8 +83,8 @@ public:
|
||||
//
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Process(const CMessagePaint&);
|
||||
virtual void Process(const CMessageSystem&);
|
||||
virtual void Process(const CMessagePaint&) override;
|
||||
virtual void Process(const CMessageSystem&) override;
|
||||
};
|
||||
|
||||
// Single global instance.
|
||||
|
@ -185,14 +185,14 @@ public:
|
||||
//
|
||||
|
||||
//lint -save -e1411
|
||||
virtual void Cast(CEntity** ppet)
|
||||
virtual void Cast(CEntity** ppet) override
|
||||
{
|
||||
*ppet = this;
|
||||
}
|
||||
//lint -restore
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const char* strPartType() const;
|
||||
virtual const char* strPartType() const override;
|
||||
};
|
||||
|
||||
|
||||
@ -287,20 +287,20 @@ public:
|
||||
// Overrides.
|
||||
//
|
||||
|
||||
void Move(const CPlacement3<>& p3_new, CEntity* pet_sender = 0);
|
||||
void Move(const CPlacement3<>& p3_new, CEntity* pet_sender = 0) override;
|
||||
|
||||
// Respond to move messages by moving myself if my parent moves.
|
||||
void Process(const CMessageMove& msgmove);
|
||||
void Process(const CMessageMove& msgmove) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual char * pcSave(char * pc_buffer) const;
|
||||
virtual char * pcSave(char * pc_buffer) const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const char * pcLoad(const char * pc_buffer);
|
||||
virtual const char * pcLoad(const char * pc_buffer) override;
|
||||
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const char* strPartType() const;
|
||||
virtual const char* strPartType() const override;
|
||||
|
||||
//protected:
|
||||
// How can we update attached guys when we aren't in run mode if this is protected?
|
||||
|
@ -81,10 +81,10 @@ public:
|
||||
//
|
||||
|
||||
// Invalidate shadow buffer when objects added.
|
||||
void Process(const CMessageCreate& msgcreate); //lint !e1411 //Yes, this had the same name as other functions.
|
||||
void Process(const CMessageCreate& msgcreate) override; //lint !e1411 //Yes, this had the same name as other functions.
|
||||
|
||||
// Invalidate shadow buffer when I myself am moved.
|
||||
void Move(const CPlacement3<>& p3_new, CEntity* pet_sender = 0);
|
||||
void Move(const CPlacement3<>& p3_new, CEntity* pet_sender = 0) override;
|
||||
|
||||
//******************************************************************************************
|
||||
//
|
||||
@ -107,25 +107,25 @@ public:
|
||||
//
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual bool bIncludeInBuildPart() const
|
||||
virtual bool bIncludeInBuildPart() const override
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual bool bCanHaveChildren()
|
||||
virtual bool bCanHaveChildren() override
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const char* strPartType() const;
|
||||
virtual const char* strPartType() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual char * pcSave(char * pc_buffer) const;
|
||||
virtual char * pcSave(char * pc_buffer) const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const char * pcLoad(const char * pc_buffer);
|
||||
virtual const char * pcLoad(const char * pc_buffer) override;
|
||||
|
||||
|
||||
};
|
||||
|
@ -784,61 +784,61 @@ public:
|
||||
//
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual float fDistanceFromGlobalCameraSqr() const;
|
||||
virtual float fDistanceFromGlobalCameraSqr() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual CPresence3<> pr3Presence() const;
|
||||
virtual CPresence3<> pr3Presence() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void SetPresence(const CPresence3<> &pr3);
|
||||
virtual void SetPresence(const CPresence3<> &pr3) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual CPlacement3<> p3Placement() const;
|
||||
virtual CPlacement3<> p3Placement() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void SetPlacement(const CPlacement3<> &p3);
|
||||
virtual void SetPlacement(const CPlacement3<> &p3) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual CVector3<> v3Pos() const;
|
||||
virtual CVector3<> v3Pos() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void SetPos(const CVector3<>& v3_pos);
|
||||
virtual void SetPos(const CVector3<>& v3_pos) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual CRotate3<> r3Rot() const;
|
||||
virtual CRotate3<> r3Rot() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void SetRot(const CRotate3<>& r3_rot);
|
||||
virtual void SetRot(const CRotate3<>& r3_rot) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual float fGetScale() const;
|
||||
virtual float fGetScale() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void SetScale(float f_new_scale);
|
||||
virtual void SetScale(float f_new_scale) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Move(const CPlacement3<>& p3_new, CEntity* pet_sender = 0);
|
||||
virtual void Move(const CPlacement3<>& p3_new, CEntity* pet_sender = 0) override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual rptr_const<CRenderType> prdtGetRenderType() const;
|
||||
virtual rptr_const<CRenderType> prdtGetRenderType() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual rptr<CShape> pshGetShape() const;
|
||||
virtual rptr<CShape> pshGetShape() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual rptr<CMesh> pmshGetMesh() const;
|
||||
virtual rptr<CMesh> pmshGetMesh() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual bool bContainsMovingObject() const;
|
||||
virtual bool bContainsMovingObject() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Cast(CInstance** ppins)
|
||||
virtual void Cast(CInstance** ppins) override
|
||||
{
|
||||
*ppins = this;
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual const CBoundVol* pbvBoundingVol() const;
|
||||
virtual const CBoundVol* pbvBoundingVol() const override;
|
||||
|
||||
|
||||
//*****************************************************************************************
|
||||
@ -1015,7 +1015,7 @@ public:
|
||||
//
|
||||
virtual bool bIsMoving
|
||||
(
|
||||
) const;
|
||||
) const override;
|
||||
//
|
||||
// Returns 'true' if the instance is moving or is likely to move.
|
||||
//
|
||||
@ -1025,7 +1025,7 @@ public:
|
||||
//
|
||||
virtual bool bCanHaveChildren
|
||||
(
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Returns 'true' if the instance is immovable.
|
||||
//
|
||||
@ -1035,7 +1035,7 @@ public:
|
||||
//
|
||||
virtual const char* strPartType
|
||||
(
|
||||
) const;
|
||||
) const override;
|
||||
//
|
||||
// Returns a partition type string.
|
||||
//
|
||||
@ -1045,7 +1045,7 @@ public:
|
||||
//
|
||||
virtual bool bEmptyPart
|
||||
(
|
||||
) const
|
||||
) const override
|
||||
//
|
||||
// Returns 'true' if the partition is empty, otherwise returns 'false.'
|
||||
//
|
||||
@ -1059,7 +1059,7 @@ public:
|
||||
|
||||
//*****************************************************************************************
|
||||
//
|
||||
virtual bool bIsInstance() const
|
||||
virtual bool bIsInstance() const override
|
||||
//
|
||||
// Returns true if this is an instance object.
|
||||
//
|
||||
@ -1161,7 +1161,7 @@ public:
|
||||
|
||||
//*****************************************************************************************
|
||||
//
|
||||
virtual bool bPreload(const CBoundVol* pbv, const CPresence3<>* pr3, bool b_is_contained = false);
|
||||
virtual bool bPreload(const CBoundVol* pbv, const CPresence3<>* pr3, bool b_is_contained = false) override;
|
||||
//
|
||||
// Preloads object into memory.
|
||||
//
|
||||
@ -1171,7 +1171,7 @@ public:
|
||||
//
|
||||
virtual uint32 u4GetUniqueHandle
|
||||
(
|
||||
) const;
|
||||
) const override;
|
||||
//
|
||||
// Returns a value uniquely representing the object.
|
||||
//
|
||||
@ -1193,7 +1193,7 @@ public:
|
||||
virtual char * pcSave
|
||||
(
|
||||
char * pc_buffer
|
||||
) const;
|
||||
) const override;
|
||||
//
|
||||
// Saves the instance delta into buffer.
|
||||
//
|
||||
@ -1207,7 +1207,7 @@ public:
|
||||
virtual const char* pcLoad
|
||||
(
|
||||
const char * pc_buffer
|
||||
);
|
||||
) override;
|
||||
//
|
||||
// Sets the instance internal variables based on info in buffer.
|
||||
//
|
||||
@ -1306,7 +1306,7 @@ public:
|
||||
//
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual bool bIsBackdrop()
|
||||
virtual bool bIsBackdrop() override
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
@ -131,13 +131,14 @@
|
||||
*
|
||||
**********************************************************************************************/
|
||||
|
||||
#error MessageTypes.hpp is now obsolete! Use MessageTypes/foo.hpp
|
||||
|
||||
#if 0
|
||||
|
||||
#ifndef HEADER_LIB_ENTITYDBASE_MESSAGETYPES_HPP
|
||||
#define HEADER_LIB_ENTITYDBASE_MESSAGETYPES_HPP
|
||||
|
||||
#error MessageTypes.hpp is now obsolete! Use MessageTypes/foo.hpp
|
||||
|
||||
#if 0
|
||||
|
||||
#include "Lib/EntityDBase/Entity.hpp"
|
||||
#include "Lib/EntityDBase/Message.hpp"
|
||||
|
||||
|
@ -245,7 +245,7 @@ public:
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
virtual void Queue() const;
|
||||
virtual void Queue() const override;
|
||||
|
||||
//*****************************************************************************************
|
||||
//
|
||||
@ -278,14 +278,14 @@ public:
|
||||
protected:
|
||||
//*****************************************************************************************
|
||||
//
|
||||
void DeliverTo(CEntity* pet) const
|
||||
void DeliverTo(CEntity* pet) const override
|
||||
{
|
||||
pet->Process(*this);
|
||||
}
|
||||
|
||||
//*****************************************************************************************
|
||||
//
|
||||
const char* strName() const
|
||||
const char* strName() const override
|
||||
{
|
||||
return "Audio";
|
||||
}
|
||||
|
@ -190,16 +190,16 @@ protected:
|
||||
//
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void Send() const;
|
||||
virtual void Send() const override;
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void DeliverTo(CEntity* pet) const
|
||||
virtual void DeliverTo(CEntity* pet) const override
|
||||
{
|
||||
pet->Process(*this);
|
||||
}
|
||||
|
||||
//******************************************************************************************
|
||||
virtual const char* strName() const
|
||||
virtual const char* strName() const override
|
||||
{
|
||||
return "Collision";
|
||||
}
|
||||
|
@ -73,12 +73,12 @@ protected:
|
||||
// Overrides.
|
||||
//
|
||||
|
||||
void DeliverTo(CEntity* pet) const { pet->Process(*this); }
|
||||
const char* strName() const { return "Control"; }
|
||||
void DeliverTo(CEntity* pet) const override { pet->Process(*this); }
|
||||
const char* strName() const override { return "Control"; }
|
||||
|
||||
//******************************************************************************************
|
||||
//
|
||||
virtual void Send() const;
|
||||
virtual void Send() const override;
|
||||
//
|
||||
// Send this message.
|
||||
//
|
||||
@ -90,7 +90,7 @@ protected:
|
||||
|
||||
//******************************************************************************************
|
||||
//
|
||||
virtual void ExtractReplayData() const;
|
||||
virtual void ExtractReplayData() const override;
|
||||
//
|
||||
// Extract replay data specific to this message
|
||||
//
|
||||
@ -142,20 +142,20 @@ protected:
|
||||
//
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void DeliverTo(CEntity* pet) const
|
||||
virtual void DeliverTo(CEntity* pet) const override
|
||||
{
|
||||
pet->Process(*this);
|
||||
}
|
||||
|
||||
//******************************************************************************************
|
||||
virtual const char* strName() const
|
||||
virtual const char* strName() const override
|
||||
{
|
||||
return "NewRaster";
|
||||
}
|
||||
|
||||
//******************************************************************************************
|
||||
//
|
||||
virtual void Send() const;
|
||||
virtual void Send() const override;
|
||||
//
|
||||
// Send this message.
|
||||
//
|
||||
@ -167,7 +167,7 @@ protected:
|
||||
|
||||
//******************************************************************************************
|
||||
//
|
||||
virtual void ExtractReplayData() const;
|
||||
virtual void ExtractReplayData() const override;
|
||||
//
|
||||
// Extract replay data specific to this message
|
||||
//
|
||||
|
@ -63,13 +63,13 @@ protected:
|
||||
//
|
||||
|
||||
//******************************************************************************************
|
||||
virtual void DeliverTo(CEntity* pet) const
|
||||
virtual void DeliverTo(CEntity* pet) const override
|
||||
{
|
||||
pet->Process(*this);
|
||||
}
|
||||
|
||||
//******************************************************************************************
|
||||
virtual const char* strName() const
|
||||
virtual const char* strName() const override
|
||||
{
|
||||
return "Create";
|
||||
}
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user