mirror/JurassicParkTrespasser
1
0
Fork 0
mirror of https://github.com/OpenTrespasser/JurassicParkTrespasser.git synced 2024-12-19 15:11:57 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: mirror:040c99d81bec2cd2c5fc01eea4b1f1afeff976fa
Branches Tags
mirror:master
mirror:dev
mirror:v0.0.1
mirror:original
..
compare: mirror:cdc57afed5877fefe20289effa92a8baa7912e05
Branches Tags
mirror:dev
mirror:master
mirror:v0.0.1
mirror:original

No commits in common. "040c99d81bec2cd2c5fc01eea4b1f1afeff976fa" and "cdc57afed5877fefe20289effa92a8baa7912e05" have entirely different histories.
040c99d81b ... cdc57afed5

270 changed files with 1522 additions and 2006 deletions
Show Stats Expand all files Collapse all files

1
jp2_pc/CMakeLists.txt
View File

@ -42,7 +42,6 @@ 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
jp2_pc/Source/Examples/Class.hpp
View File

@ -1,4 +1,3 @@
#pragma once
//**********************************************************************************************
//

2
jp2_pc/Source/Examples/Examples.hpp
View File

@ -1,5 +1,3 @@
#pragma once
//**********************************************************************************************
//
// Following are example declarations for each type of item.

4
jp2_pc/Source/Examples/Function.hpp
View File

@ -1,6 +1,4 @@
#pragma once
//******************************************************************************************
//******************************************************************************************
//
type tFunction
(

2
jp2_pc/Source/Examples/Namespace.hpp
View File

@ -1,5 +1,3 @@
#pragma once
//**********************************************************************************************
//
namespace (name)

2
jp2_pc/Source/Examples/Section.hpp
View File

@ -1,5 +1,3 @@
#pragma once
//**********************************************************************************************
//
// Global definitions.

10
jp2_pc/Source/GUIApp/AI Dialogs2Dlg.h
View File

@ -1,5 +1,3 @@
#pragma once
// AI Dialogs2Dlg.h : header file
//
@ -28,7 +26,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CAIDialogs2Dlg)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
@ -37,11 +35,11 @@ protected:
// Generated message map functions
//{{AFX_MSG(CAIDialogs2Dlg)
virtual BOOL OnInitDialog() override;
virtual BOOL OnInitDialog();
afx_msg void OnPaint();
afx_msg HCURSOR OnQueryDragIcon();
virtual void OnOK() override;
virtual void OnCancel() override;
virtual void OnOK();
virtual void OnCancel();
afx_msg void OnAll();
afx_msg void OnNone();
afx_msg void OnDblclkActivities();

2
jp2_pc/Source/GUIApp/Background.hpp
View File

@ -66,7 +66,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CBackground)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override;
virtual void DoDataExchange(CDataExchange* pDX);
//}}AFX_VIRTUAL
protected:

2
jp2_pc/Source/GUIApp/CameraProperties.hpp
View File

@ -60,7 +60,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CCameraProperties)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
protected:

2
jp2_pc/Source/GUIApp/DialogAlphaColour.hpp
View File

@ -57,7 +57,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogAlphaColour)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation

2
jp2_pc/Source/GUIApp/DialogBumpPack.hpp
View File

@ -85,7 +85,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogBumpPack)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
int32 i4PageSelect; // current selected bump map page or -1

2
jp2_pc/Source/GUIApp/DialogCulling.hpp
View File

@ -63,7 +63,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogCulling)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation

2
jp2_pc/Source/GUIApp/DialogDepthSort.hpp
View File

@ -78,7 +78,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogDepthSort)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation

2
jp2_pc/Source/GUIApp/DialogFog.hpp
View File

@ -57,7 +57,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogFog)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
protected:

6
jp2_pc/Source/GUIApp/DialogGamma.hpp
View File

@ -1,5 +1,3 @@
#pragma once
// DialogGamma.hpp : header file
//
@ -25,7 +23,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogGamma)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
@ -42,7 +40,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() override;
virtual void OnOK();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};

4
jp2_pc/Source/GUIApp/DialogGore.hpp
View File

@ -1,5 +1,3 @@
#pragma once
// DialogGore.hpp : header file
//
@ -24,7 +22,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogGore)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation

2
jp2_pc/Source/GUIApp/DialogGun.hpp
View File

@ -62,7 +62,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogGun)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation

4
jp2_pc/Source/GUIApp/DialogMagnet.h
View File

@ -50,8 +50,8 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogMagnet)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
//}}AFX_VIRTUAL
// Implementation

8
jp2_pc/Source/GUIApp/DialogMaterial.h
View File

@ -53,7 +53,7 @@ protected:
//
//******************************************************************************************
virtual void SetVal(T val) override
virtual void SetVal(T val)
//
// Converts the angle (in degrees) to a cosine.
//
@ -62,7 +62,7 @@ protected:
}
//******************************************************************************************
virtual T tGetVal() const override
virtual T tGetVal() const
//
// 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) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
@ -134,7 +134,7 @@ protected:
//
//******************************************************************************************
virtual void Update(CController& ctrl) override;
virtual void Update(CController& ctrl);
};

2
jp2_pc/Source/GUIApp/DialogMemLog.hpp
View File

@ -59,7 +59,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogTexturePack)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
protected:

4
jp2_pc/Source/GUIApp/DialogMipmap.hpp
View File

@ -1,5 +1,3 @@
#pragma once
// DialogMipmap.hpp : header file
//
@ -23,7 +21,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogMipmap)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation

2
jp2_pc/Source/GUIApp/DialogObject.h
View File

@ -72,7 +72,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogObject)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation

4
jp2_pc/Source/GUIApp/DialogOcclusion.hpp
View File

@ -1,5 +1,3 @@
#pragma once
/**********************************************************************************************
*
* Copyright © DreamWorks Interactive, 1997.
@ -47,7 +45,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogOcclusion)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation

2
jp2_pc/Source/GUIApp/DialogPartition.hpp
View File

@ -50,7 +50,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogPartition)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation

12
jp2_pc/Source/GUIApp/DialogPhysics.cpp
View File

@ -143,14 +143,14 @@ public:
}
//******************************************************************************************
virtual float fGet() const override
virtual float fGet() const
{
Assert(pfVar);
return *pfVar;
}
//******************************************************************************************
virtual void Set(float f) override
virtual void Set(float f)
{
Assert(pfVar);
*pfVar = f;
@ -175,14 +175,14 @@ public:
}
//******************************************************************************************
virtual float fGet() const override
virtual float fGet() const
{
Assert(pfVar);
return pphibBox ? pphibBox->*pfVar : 0.0;
}
//******************************************************************************************
virtual void Set(float f) override
virtual void Set(float f)
{
Assert(pfVar);
if (pphibBox)
@ -207,7 +207,7 @@ public:
}
//******************************************************************************************
virtual float fGet() const override
virtual float fGet() const
{
// Return calculated value.
if (CItemFloatBox::pphibBox)
@ -220,7 +220,7 @@ public:
}
//******************************************************************************************
virtual void Set(float f) override
virtual void Set(float f)
{
if (CItemFloatBox::pphibBox)
{

6
jp2_pc/Source/GUIApp/DialogPhysics.hpp
View File

@ -113,7 +113,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogPhysics)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // 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() override;
virtual void OnOK();
afx_msg void OnReset();
virtual void OnCancel() override;
virtual void OnCancel();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};

2
jp2_pc/Source/GUIApp/DialogPlayer.h
View File

@ -101,7 +101,7 @@ public:
protected:
//}}AFX_VIRTUAL
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
// Implementation
protected:

4
jp2_pc/Source/GUIApp/DialogRenderCache.hpp
View File

@ -1,5 +1,3 @@
#pragma once
// DialogRenderCache.hpp : header file
//
@ -40,7 +38,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogRenderCache)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation

4
jp2_pc/Source/GUIApp/DialogScheduler.hpp
View File

@ -1,5 +1,3 @@
#pragma once
// DialogScheduler.hpp : header file
//
@ -25,7 +23,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogScheduler)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation

6
jp2_pc/Source/GUIApp/DialogScrollbars.hpp
View File

@ -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.
//

2
jp2_pc/Source/GUIApp/DialogSky.hpp
View File

@ -79,7 +79,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogSky)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
protected:

4
jp2_pc/Source/GUIApp/DialogSoundMaterial.hpp
View File

@ -166,7 +166,7 @@ public:
void TestPlay(TSoundHandle sndhnd, bool b_loop);
//*****************************************************************************************
virtual void OnOK() override;
virtual void OnOK();
//*****************************************************************************************
//
@ -224,7 +224,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogSoundMaterial)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
//*****************************************************************************************

2
jp2_pc/Source/GUIApp/DialogString.hpp
View File

@ -60,7 +60,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogString)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
protected:

6
jp2_pc/Source/GUIApp/DialogTeleport.h
View File

@ -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) override;
virtual BOOL Create(LPCTSTR lpszClassName, LPCTSTR lpszWindowName, DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID, CCreateContext* pContext = NULL);
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
@ -42,7 +42,7 @@ protected:
// Generated message map functions
//{{AFX_MSG(CDialogTeleport)
virtual void OnOK() override;
virtual void OnOK();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};

4
jp2_pc/Source/GUIApp/DialogTerrain.hpp
View File

@ -1,5 +1,3 @@
#pragma once
/**********************************************************************************************
*
* Copyright © DreamWorks Interactive, 1997.
@ -96,7 +94,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogTerrain)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation

2
jp2_pc/Source/GUIApp/DialogTexturePack.hpp
View File

@ -62,7 +62,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogTexturePack)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
protected:

2
jp2_pc/Source/GUIApp/DialogTexturePackOptions.hpp
View File

@ -56,7 +56,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogTexturePackOptions)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
protected:

2
jp2_pc/Source/GUIApp/DialogVM.hpp
View File

@ -63,7 +63,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogVM)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
protected:

4
jp2_pc/Source/GUIApp/DialogWater.hpp
View File

@ -1,5 +1,3 @@
#pragma once
/**********************************************************************************************
*
* Copyright © DreamWorks Interactive, 1998.
@ -54,7 +52,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogWater)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation

2
jp2_pc/Source/GUIApp/GUIApp.cpp
View File

@ -435,7 +435,7 @@ public:
//*****************************************************************************************
//
BOOL OnInitDialog() override
BOOL OnInitDialog()
//
// Set the version and date strings.
//

4
jp2_pc/Source/GUIApp/GUIApp.h
View File

@ -69,8 +69,8 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CGUIAppApp)
public:
virtual BOOL InitInstance() override;
virtual int ExitInstance() override;
virtual BOOL InitInstance();
virtual int ExitInstance();
//}}AFX_VIRTUAL
//{{AFX_MSG(CGUIAppApp)

18
jp2_pc/Source/GUIApp/GUIAppDlg.h
View File

@ -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) override;
virtual BOOL PreTranslateMessage(MSG* pMsg) override;
virtual BOOL DestroyWindow() override;
virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo);
virtual BOOL PreTranslateMessage(MSG* pMsg);
virtual BOOL DestroyWindow();
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual LRESULT DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam) override;
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
virtual LRESULT DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam);
//}}AFX_VIRTUAL
@ -816,10 +816,10 @@ protected:
// Overridden from CInstance...
//*****************************************************************************************
virtual char * pcSave(char * pc_buffer) const override;
virtual char * pcSave(char * pc_buffer) const;
//*****************************************************************************************
virtual const char* pcLoad(const char* pc_buffer) override;
virtual const char* pcLoad(const char* pc_buffer);
@ -852,7 +852,7 @@ protected:
public:
//{{AFX_MSG(CGUIAppDlg)
virtual BOOL OnInitDialog() override;
virtual BOOL OnInitDialog();
afx_msg void OnPaint();
afx_msg HCURSOR OnQueryDragIcon();
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);

12
jp2_pc/Source/GUIApp/GUIControls.hpp
View File

@ -189,7 +189,7 @@ protected:
//
//******************************************************************************************
virtual void DDX(CDataExchange* pDX) override
virtual void DDX(CDataExchange* pDX)
{
::DDX_Control(pDX, iID, *this);
Display();
@ -204,7 +204,7 @@ protected:
}
*/
//******************************************************************************************
virtual BOOL OnChildNotify( UINT message, WPARAM wParam, LPARAM lParam, LRESULT* pLResult ) override
virtual BOOL OnChildNotify( UINT message, WPARAM wParam, LPARAM lParam, LRESULT* pLResult )
{
// Dispatch messages.
if (message == WM_NOTIFY)
@ -230,7 +230,7 @@ protected:
//******************************************************************************************
//
virtual void Display() const override
virtual void Display() const
//
// Display the current value.
//
@ -298,7 +298,7 @@ protected:
//
//******************************************************************************************
virtual BOOL OnDeltaPos( NM_UPDOWN* pNMUpDown ) override
virtual BOOL OnDeltaPos( NM_UPDOWN* pNMUpDown )
{
//
// Handle spinner control.
@ -353,7 +353,7 @@ protected:
}
//******************************************************************************************
virtual void Format(char str_text[]) const override;
virtual void Format(char str_text[]) const;
};
//******************************************************************************************
@ -404,7 +404,7 @@ protected:
//
//******************************************************************************************
virtual BOOL OnDeltaPos( NM_UPDOWN* pNMUpDown ) override
virtual BOOL OnDeltaPos( NM_UPDOWN* pNMUpDown )
{
if (MinMax == emmMIN)
tMin = *ptVarClamp * tDisplayFactor;

2
jp2_pc/Source/GUIApp/LightProperties.hpp
View File

@ -83,7 +83,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CLightProperties)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
protected:

10
jp2_pc/Source/GUIApp/ParameterDlg.h
View File

@ -1,5 +1,3 @@
#pragma once
// ParameterDlg.h : header file
//
@ -47,7 +45,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CParameterDlg)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@ -56,9 +54,9 @@ protected:
// Generated message map functions
//{{AFX_MSG(CParameterDlg)
virtual BOOL OnInitDialog() override;
virtual void OnOK() override;
virtual void OnCancel() override;
virtual BOOL OnInitDialog();
virtual void OnOK();
virtual void OnCancel();
afx_msg void OnPaint();
afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
afx_msg void OnChangeEditParameter();

2
jp2_pc/Source/GUIApp/PerspectiveSubdivideDialog.hpp
View File

@ -63,7 +63,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CPerspectiveSubdivideDialog)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation

2
jp2_pc/Source/GUIApp/QualityDialog.hpp
View File

@ -52,7 +52,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogQuality)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
protected:

2
jp2_pc/Source/GUIApp/SoundPropertiesDlg.hpp
View File

@ -96,7 +96,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDialogSoundProp)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
protected:

4
jp2_pc/Source/GUIApp/TerrainTest.hpp
View File

@ -253,8 +253,8 @@ private:
// Overrides.
//
void Process(const CMessageStep&) override;
void Process(const CMessagePaint& msgpaint) override;
void Process(const CMessageStep&);
void Process(const CMessagePaint& msgpaint);
};

2
jp2_pc/Source/GUIApp/Toolbar.hpp
View File

@ -77,7 +77,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CTool)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
protected:

1
jp2_pc/Source/GUIApp/resource.h
View File

@ -1,4 +1,3 @@
#pragma once
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by GUIApp.rc

8
jp2_pc/Source/Game/AI/AIGraph.hpp
View File

@ -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) override;
virtual void RemoveNode(int i_node_index);
//*********************************************************************************
//
@ -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.
//

8
jp2_pc/Source/Game/AI/AIMain.hpp
View File

@ -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) override;
virtual void Process(const CMessagePaint& msgpaint);
//
// Draws any AI debugging info.
//
@ -680,10 +680,10 @@ public:
//*****************************************************************************************
virtual char * pcSave(char * pc_buffer) const override;
virtual char * pcSave(char * pc_buffer) const;
//*****************************************************************************************
virtual const char * pcLoad(const char * pc_buffer) override;
virtual const char * pcLoad(const char * pc_buffer);

4
jp2_pc/Source/Game/AI/Activity.hpp
View File

@ -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) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};

90
jp2_pc/Source/Game/AI/ActivityAttack.hpp
View File

@ -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) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#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) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -267,14 +267,14 @@ public:
//
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
//*****************************************************************************************
virtual void MaybeSetTargetLock(CInfluence *pinf) override;
virtual void MaybeSetTargetLock(CInfluence *pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#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) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -392,27 +392,27 @@ public:
//
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
//*************************************************************************************
virtual void Start(CInfluence* pinf) override;
virtual void Start(CInfluence* pinf);
//*************************************************************************************
virtual void DoPhaseOne(CRating rt_importance, CInfluence* pinf) override;
virtual void DoPhaseOne(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual void DoPhaseTwo(CRating rt_importance, CInfluence* pinf) override;
virtual void DoPhaseTwo(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual void DoPhaseThree(CRating rt_importance, CInfluence* pinf) override;
virtual void DoPhaseThree(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual void DoPhaseFour(CRating rt_importance, CInfluence* pinf) override;
virtual void DoPhaseFour(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -455,30 +455,30 @@ public:
//
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
//*************************************************************************************
virtual void Start(CInfluence* pinf) override;
virtual void Start(CInfluence* pinf);
//*************************************************************************************
virtual void Stop(CInfluence* pinf) override;
virtual void Stop(CInfluence* pinf);
//*************************************************************************************
virtual void DoPhaseOne(CRating rt_importance, CInfluence* pinf) override;
virtual void DoPhaseOne(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual void DoPhaseTwo(CRating rt_importance, CInfluence* pinf) override;
virtual void DoPhaseTwo(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual void DoPhaseThree(CRating rt_importance, CInfluence* pinf) override;
virtual void DoPhaseThree(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual void DoPhaseFour(CRating rt_importance, CInfluence* pinf) override;
virtual void DoPhaseFour(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#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) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#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) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -627,7 +627,7 @@ public:
//*********************************************************************************
virtual void SetHeadPoint(CInfluence* pinf) override;
virtual void SetHeadPoint(CInfluence* pinf);
//*****************************************************************************************
//
@ -636,7 +636,7 @@ public:
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -673,26 +673,26 @@ public:
//
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
//*************************************************************************************
virtual void Start();
//*************************************************************************************
virtual void DoPhaseOne(CRating rt_importance, CInfluence* pinf) override;
virtual void DoPhaseOne(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual void DoPhaseTwo(CRating rt_importance, CInfluence* pinf) override;
virtual void DoPhaseTwo(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual void DoPhaseThree(CRating rt_importance, CInfluence* pinf) override;
virtual void DoPhaseThree(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual void DoPhaseFour(CRating rt_importance, CInfluence* pinf) override;
virtual void DoPhaseFour(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#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) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#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) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#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) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};

20
jp2_pc/Source/Game/AI/ActivityCompound.hpp
View File

@ -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;
);
//
//******************************
};

2
jp2_pc/Source/Game/AI/ActivityPhased.hpp
View File

@ -153,7 +153,7 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
};

26
jp2_pc/Source/Game/AI/ActivityVocal.hpp
View File

@ -122,14 +122,14 @@ public:
//
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -166,10 +166,10 @@ public:
//
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
};
@ -211,7 +211,7 @@ public:
(
CRating rt_importance,
CInfluence* pinf
) override;
);
};
@ -248,10 +248,10 @@ public:
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
};
@ -287,10 +287,10 @@ public:
//
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
};
@ -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;
);
};

42
jp2_pc/Source/Game/AI/EmotionActivities.hpp
View File

@ -69,11 +69,11 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -109,14 +109,14 @@ public:
//
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -150,11 +150,11 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -189,14 +189,14 @@ public:
//
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -229,11 +229,11 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -266,11 +266,11 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -303,11 +303,11 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -340,11 +340,11 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -377,14 +377,14 @@ public:
//
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};

34
jp2_pc/Source/Game/AI/HeadActivities.hpp
View File

@ -100,11 +100,11 @@ public:
(
CRating rt_importance,
CInfluence* pinf
) override;
);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -142,11 +142,11 @@ public:
(
CRating rt_importance,
CInfluence* pinf
) override;
);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -183,11 +183,11 @@ public:
(
CRating rt_importance,
CInfluence* pinf
) override;
);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -222,11 +222,11 @@ public:
(
CRating rt_importance,
CInfluence* pinf
) override;
);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -257,18 +257,18 @@ public:
//
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
//*********************************************************************************
virtual void Act
(
CRating rt_importance,
CInfluence* pinf
) override;
);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -304,18 +304,18 @@ public:
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
//*********************************************************************************
virtual void Act
(
CRating rt_importance,
CInfluence* pinf
) override;
);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -350,14 +350,14 @@ public:
//
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};

14
jp2_pc/Source/Game/AI/Influence.hpp
View File

@ -136,7 +136,7 @@ public:
CInstance* const pinsTarget; // The object associated with this influence
// or 0 if none.
mutable CSet<EInfluenceFlag> setFlags; // A bunch of flags for an influence.
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 override;
) const;
//
// 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,10 +415,6 @@ public:
// return (CInfluence)*this;
// }
static bool IsDiscardable(const CInfluence& influence)
{
return influence.setFlags[eifIS_DISCARDABLE];
}
};

110
jp2_pc/Source/Game/AI/MoveActivities.hpp
View File

@ -97,14 +97,14 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -143,14 +143,14 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -186,14 +186,14 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -234,14 +234,14 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -277,11 +277,11 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -313,14 +313,14 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -356,14 +356,14 @@ public:
//
//*********************************************************************************
virtual CRating rtRate( const CFeeling& feel,CInfluence* pinf) override;
virtual CRating rtRate( const CFeeling& feel,CInfluence* pinf);
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -403,20 +403,20 @@ public:
//
//*********************************************************************************
virtual CRating rtRate( const CFeeling& feel,CInfluence* pinf) override;
virtual CRating rtRate( const CFeeling& feel,CInfluence* pinf);
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
//*****************************************************************************************
virtual char * pcSave(char * pc_buffer) const override;
virtual char * pcSave(char * pc_buffer) const;
//*****************************************************************************************
virtual const char * pcLoad(const char * pc_buffer) override;
virtual const char * pcLoad(const char * pc_buffer);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -456,20 +456,20 @@ public:
//
//*********************************************************************************
virtual CRating rtRate( const CFeeling& feel,CInfluence* pinf) override;
virtual CRating rtRate( const CFeeling& feel,CInfluence* pinf);
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
//*****************************************************************************************
virtual char * pcSave(char * pc_buffer) const override;
virtual char * pcSave(char * pc_buffer) const;
//*****************************************************************************************
virtual const char * pcLoad(const char * pc_buffer) override;
virtual const char * pcLoad(const char * pc_buffer);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -505,14 +505,14 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -548,14 +548,14 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -596,14 +596,14 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -641,14 +641,14 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -684,14 +684,14 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -729,14 +729,14 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -772,14 +772,14 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -826,17 +826,17 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
//*************************************************************************************
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf) override;
virtual CRating rtRate(const CFeeling& feel, CInfluence* pinf);
//*************************************************************************************
virtual void Activate(bool b_active_state) override;
virtual void Activate(bool b_active_state);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};

58
jp2_pc/Source/Game/AI/NodeHistory.hpp
View File

@ -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() override { return this; };
virtual CNHStart* pCastNHStart() { 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() override { return this; };
virtual CNHStop* pCastNHStop() { 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() override;
virtual CNodeSource* pnsReferences();
//
// Cast functions.
//
virtual CNHNodeSource* pCastNHNodeSource() override { return this; };
virtual CNHNodeSource* pCastNHNodeSource() { 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 override;
) const;
//******************************
//*************************************************************************************
virtual CNodeSource* pnsReferences() override;
virtual CNodeSource* pnsReferences();
//
// Cast functions.
//
virtual CNHInfluence* pCastNHInfluence() override { return this; };
virtual CNHInfluence* pCastNHInfluence() { 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() override { return this; };
virtual CNHInfluenceSurface*pCastNHInfluenceSurface() { return this; };
};
@ -719,15 +719,15 @@ public:
//
//*************************************************************************************
virtual float fRate(CAIGraph* paig, int i_node_index) override;
virtual float fRate(CAIGraph* paig, int i_node_index);
//*************************************************************************************
virtual void Delete(CAIGraph* paig, int i_node_index) override;
virtual void Delete(CAIGraph* paig, int i_node_index);
//
// Cast functions.
//
virtual CNHRandom* pCastNHRandom() override { return this; };
virtual CNHRandom* pCastNHRandom() { 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() override { return this; };
virtual CNHDesigner* pCastNHDesigner() { 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() override { return this; };
virtual CNHUnknown* pCastNHUnknown() { return this; };
};
//*********************************************************************************************
@ -866,7 +866,7 @@ public:
// Cast functions.
//
virtual CNHInvalid* pCastNHInvalid() override { return this; };
virtual CNHInvalid* pCastNHInvalid() { return this; };
};
#define ENTRY(type, name) char name [sizeof(type)]

4
jp2_pc/Source/Game/AI/PathAStar.hpp
View File

@ -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".
//

2
jp2_pc/Source/Game/AI/PathAvoider.hpp
View File

@ -25,9 +25,9 @@
*
**********************************************************************************************/
#if 0
#ifndef HEADER_GAME_AI_PATHAVOIDER_HPP
#define HEADER_GAME_AI_PATHAVOIDER_HPP
#if 0
#include "Pathfinder.hpp"

2
jp2_pc/Source/Game/AI/PathFailure.hpp
View File

@ -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"

22
jp2_pc/Source/Game/AI/TestActivities.hpp
View File

@ -81,7 +81,7 @@ public:
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -123,11 +123,11 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -163,11 +163,11 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -201,11 +201,11 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -243,11 +243,11 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};
@ -284,11 +284,11 @@ public:
//
//*********************************************************************************
virtual void Act(CRating rt_importance, CInfluence* pinf) override;
virtual void Act(CRating rt_importance, CInfluence* pinf);
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};

62
jp2_pc/Source/Game/AI/WorldView.cpp
View File

@ -367,38 +367,56 @@ void CWorldView::RemoveSomeInfluences()
// unimportant enough, go ahead.
// If we have a bunch of influences, remove one.
size_t discardable = 0;
CInfluenceList::iterator pinf_lowest = inflInfluences.end();
CInfluenceList::iterator pinf = inflInfluences.begin();
CInstance* lowestInstance = nullptr;
std::list<CInstance*> todelete;
for (const auto& entry : inflInfluences)
int i_discardable_count = 0;
std::list<const CInfluence*> lpinf_discard;
// Find the lamest influence and remove it.
// For now, we only remove one bad apple each cycle.
for (; pinf != inflInfluences.end(); pinf++)
{
if (gaiSystem.sNow - entry.sLastSeen > paniOwner->pbrBrain->sForgetInfluence)
entry.setFlags[eifIS_DISCARDABLE] = true;
else if (entry.rImportance < r_lowest)
TReal r_importance = (*pinf).rImportance;
if (gaiSystem.sNow - (*pinf).sLastSeen > paniOwner->pbrBrain->sForgetInfluence)
{
r_lowest = entry.rImportance;
lowestInstance = entry.pinsTarget;
// 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;
}
if (entry.setFlags[eifIS_DISCARDABLE])
if ((*pinf).setFlags[eifIS_DISCARDABLE])
{
todelete.push_back(entry.pinsTarget);
discardable++;
// Add to discard list!
lpinf_discard.push_back(&(*pinf));
++i_discardable_count;
}
}
if (lowestInstance)
{
//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 (pinf_lowest != inflInfluences.end())
{
// Add to discard list!
lpinf_discard.push_back(&(*pinf_lowest));
((CInfluence*)&(*pinf_lowest))->setFlags[eifIS_DISCARDABLE] = true;
}
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);
}
//*********************************************************************************

6
jp2_pc/Source/Game/DesignDaemon/BloodSplat.hpp
View File

@ -122,13 +122,13 @@ public:
//
//******************************************************************************************
virtual void Process(const CMessageSystem& ms) override;
virtual void Process(const CMessageSystem& ms);
//*****************************************************************************************
virtual char * pcSave(char * pc_buffer) const override;
virtual char * pcSave(char * pc_buffer) const;
//*****************************************************************************************
virtual const char * pcLoad(const char * pc_buffer) override;
virtual const char * pcLoad(const char * pc_buffer);
};
// Single global instance.

2
jp2_pc/Source/Game/DesignDaemon/Daemon.hpp
View File

@ -178,7 +178,7 @@ public:
// Overrides.
//
void Process(const CMessagePaint& msgpaint) override;
void Process(const CMessagePaint& msgpaint);
};
// Single global instance.

20
jp2_pc/Source/Game/DesignDaemon/Gun.hpp
View File

@ -158,36 +158,36 @@ public:
//
//*****************************************************************************************
virtual bool bUse(bool b_repeat) override;
virtual bool bUse(bool b_repeat);
//*****************************************************************************************
virtual void PickedUp() override;
virtual void PickedUp();
//*****************************************************************************************
virtual void Process(const CMessageMove& msg) override;
virtual void Process(const CMessageMove& msg);
//*****************************************************************************************
virtual void Process(const CMessageStep& msg) override;
virtual void Process(const CMessageStep& msg);
//*****************************************************************************************
virtual CInstance* pinsCopy() const override;
virtual CInstance* pinsCopy() const;
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
//*****************************************************************************************
virtual void Cast(CGun** ppgun) override
virtual void Cast(CGun** ppgun)
{
*ppgun = this;
}
//*****************************************************************************************
virtual char * pcSave(char * pc_buffer) const override;
virtual char * pcSave(char * pc_buffer) const;
//*****************************************************************************************
virtual const char * pcLoad(const char * pc_buffer) override;
virtual const char * pcLoad(const char * pc_buffer);
//*****************************************************************************************
// 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() override;
virtual bool bCanHaveChildren();
// CInstance* pinsCopy() const;

62
jp2_pc/Source/Game/DesignDaemon/Player.cpp
View File

@ -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 override
virtual CInstance* pinsHeldObject() const
{
return bWithin(eHandHolding, ehhHOLDING, ehhDROPPING) ? pinsHeld : 0;
}
//*****************************************************************************************
virtual bool bHandInteract(const CInstance* pins) const override
virtual bool bHandInteract(const CInstance* pins) const
{
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) override
virtual void MaybeTalkAboutAmmo(int i_current, int i_max)
{
// Bad, Bad, Bad, No negative ammo counts please.
if (i_current < 0)
@ -1641,7 +1641,7 @@ private:
}
//*****************************************************************************************
virtual void TalkAboutApproximateAmmo(int i_sample) override
virtual void TalkAboutApproximateAmmo(int i_sample)
{
// 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() override
virtual bool bCanTalk()
{
// Is Anne already speaking?
Assert(padAudioDaemon);
@ -1746,7 +1746,7 @@ private:
}
//*****************************************************************************************
virtual void StopTalking() override
virtual void StopTalking()
{
// Kill all voiceovers and music.
AlwaysAssert(padAudioDaemon);
@ -1764,13 +1764,13 @@ private:
}
//*****************************************************************************************
virtual void JumpSound() override
virtual void JumpSound()
{
Say(&ssJump);
}
//*****************************************************************************************
virtual void Pickup(CInstance* pins_obj) override
virtual void Pickup(CInstance* pins_obj)
{
// 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) override
virtual void Drop(CVector3<> v3_throw = v3Zero)
{
// See if we're holding.
if (!bWithin(eHandHolding, ehhHOLDING, ehhDROPPING))
@ -1883,7 +1883,7 @@ private:
}
//*****************************************************************************************
virtual void CheckForDrop() override
virtual void CheckForDrop()
{
// See if we're holding.
if (!PlayerSettings.bAllowDrop)
@ -1926,7 +1926,7 @@ private:
}
//*****************************************************************************************
virtual void DrawPhysics(CDraw& draw, CCamera& cam) const override
virtual void DrawPhysics(CDraw& draw, CCamera& cam) const
{
#if bVER_BONES()
CTransform3<> tf3_screen = cam.tf3ToHomogeneousScreen();
@ -1972,13 +1972,13 @@ private:
//
//*****************************************************************************************
virtual bool bIncludeInBuildPart() const override
virtual bool bIncludeInBuildPart() const
{
return false;
}
//*****************************************************************************************
virtual void HandleDamage(float f_damage, const CInstance* pins_aggressor, const CInstance* pins_me) override
virtual void HandleDamage(float f_damage, const CInstance* pins_aggressor, const CInstance* pins_me)
{
// 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 override
virtual float fWieldDamage(const CInstance* pins_weapon, float f_coll_damage) const
{
if (iSwinging == 2)
f_coll_damage *= PlayerSettings.fSwingDamageMul;
@ -2094,7 +2094,7 @@ private:
}
//*****************************************************************************************
virtual void Substitute(int i_sub) override
virtual void Substitute(int i_sub)
{
// Save our requested substitution.
// Actually perform the substitution next control message.
@ -2107,7 +2107,7 @@ private:
}
//*****************************************************************************************
virtual CPlacement3<> p3HeadPlacement() const override
virtual CPlacement3<> p3HeadPlacement() const
{
return p3Head;
}
@ -2118,7 +2118,7 @@ private:
//
//******************************************************************************************
virtual void Move(const CPlacement3<>& p3_new, CEntity* pet_sender) override
virtual void Move(const CPlacement3<>& p3_new, CEntity* pet_sender)
{
if (pet_sender == pphSystem)
{
@ -2223,7 +2223,7 @@ private:
}
//*****************************************************************************************
virtual void Process(const CMessageSystem& msgsys) override
virtual void Process(const CMessageSystem& msgsys)
{
if (msgsys.escCode == escSTOP_SIM)
{
@ -2240,7 +2240,7 @@ private:
}
//*****************************************************************************************
virtual void Process(const CMessageStep& msgstep) override
virtual void Process(const CMessageStep& msgstep)
{
// Invoke base class message handling.
CAnimate::Process(msgstep);
@ -2334,7 +2334,7 @@ private:
}
//*****************************************************************************************
virtual void Process(const CMessageControl& msgc) override
virtual void Process(const CMessageControl& msgc)
{
bool b_use = false;
@ -3108,7 +3108,7 @@ private:
}
//******************************************************************************************
virtual void Process(const CMessageCollision& msgcoll) override
virtual void Process(const CMessageCollision& msgcoll)
{
CTimeBlock tmb(&psCollisionMsgPlayer);
@ -3197,7 +3197,7 @@ private:
}
//*****************************************************************************************
virtual void Process(const CMessagePhysicsReq& msgpr) override
virtual void Process(const CMessagePhysicsReq& msgpr)
{
if (!bPhysics)
return;
@ -3237,7 +3237,7 @@ private:
}
//*****************************************************************************************
virtual void Process(const CMessageMove& msgmv) override
virtual void Process(const CMessageMove& msgmv)
{
CTimeBlock tmb(&psMoveMsgPlayer);
@ -3269,7 +3269,7 @@ private:
}
//*****************************************************************************************
virtual char* pcSave(char* pc) const override
virtual char* pcSave(char* pc) const
{
// Save the instance location data.
pc = CAnimate::pcSave(pc);
@ -3316,7 +3316,7 @@ private:
}
//*****************************************************************************************
virtual const char* pcLoad(const char* pc) override
virtual const char* pcLoad(const char* pc)
{
pc = CAnimate::pcLoad(pc);
@ -3388,7 +3388,7 @@ private:
}
//*****************************************************************************************
virtual void Cast(CPlayer** ppplay) override
virtual void Cast(CPlayer** ppplay)
{
*ppplay = this;
}
@ -3397,7 +3397,7 @@ private:
//
virtual const char* strPartType
(
) const override
) const
//
// Returns a partition type string.
//
@ -3407,7 +3407,7 @@ private:
}
//*****************************************************************************************
virtual void InitializeDataStatic() override
virtual void InitializeDataStatic()
{
SetFlagHardwareAble(true);
CPartition::InitializeDataStatic();

10
jp2_pc/Source/Game/DesignDaemon/Socket.hpp
View File

@ -85,16 +85,16 @@ public:
//
//*****************************************************************************************
virtual bool bUse(bool b_repeat) override;
virtual bool bUse(bool b_repeat);
//*****************************************************************************************
virtual void PickedUp() override;
virtual void PickedUp();
//*****************************************************************************************
virtual CInstance* pinsCopy() const override;
virtual CInstance* pinsCopy() const;
//*****************************************************************************************
virtual void Cast(CSocket** psock) override
virtual void Cast(CSocket** psock)
{
*psock = this;
}
@ -102,7 +102,7 @@ public:
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
};

8
jp2_pc/Source/GroffBuild/dialogs.h
View File

@ -62,7 +62,7 @@ public:
virtual ~CMultiWnd() {;}
protected:
virtual LRESULT BaseHandler(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) override;
virtual LRESULT BaseHandler(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
};
@ -83,10 +83,10 @@ public:
virtual void OnOK();
protected:
virtual LRESULT BaseHandler(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) override;
virtual LRESULT BaseHandler(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
virtual void OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) override;
virtual BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam) override;
virtual void OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify);
virtual BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam);
};

18
jp2_pc/Source/GroffBuild/main.h
View File

@ -63,13 +63,13 @@ public:
HWND m_hwndList;
protected:
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;
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);
};
@ -85,8 +85,8 @@ public:
std::vector<GBUILD> m_vGBuild;
protected:
void OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) override;
BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam) override;
void OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify);
BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam);
};

4
jp2_pc/Source/InitGUIApp/InitGUIApp.h
View File

@ -1,5 +1,3 @@
#pragma once
// InitGUIApp.h : main header file for the INITGUIAPP application
//
@ -23,7 +21,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CInitGUIAppApp)
public:
virtual BOOL InitInstance() override;
virtual BOOL InitInstance();
//}}AFX_VIRTUAL
// Implementation

2
jp2_pc/Source/InitGUIApp/InitGUIAppDlg.cpp
View File

@ -40,7 +40,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CAboutDlg)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation

8
jp2_pc/Source/InitGUIApp/InitGUIAppDlg.h
View File

@ -1,5 +1,3 @@
#pragma once
// InitGUIAppDlg.h : header file
//
@ -27,7 +25,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CInitGUIAppDlg)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
@ -41,11 +39,11 @@ protected:
// Generated message map functions
//{{AFX_MSG(CInitGUIAppDlg)
virtual BOOL OnInitDialog() override;
virtual BOOL OnInitDialog();
afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
afx_msg void OnPaint();
afx_msg HCURSOR OnQueryDragIcon();
virtual void OnOK() override;
virtual void OnOK();
afx_msg void OnSelchangeComboVideoguid();
afx_msg void OnSelchangeComboD3d();
afx_msg void OnSelchangeListCard();

2
jp2_pc/Source/InitGUIApp/Resource.h
View File

@ -1,5 +1,3 @@
#pragma once
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by InitGUIApp.rc

2
jp2_pc/Source/InitGUIApp/StdAfx.h
View File

@ -1,5 +1,3 @@
#pragma once
// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently, but
// are changed infrequently

4
jp2_pc/Source/InitGUIApp2/InitGUIApp2.h
View File

@ -1,5 +1,3 @@
#pragma once
// InitGUIApp2.h : main header file for the INITGUIAPP2 application
//
@ -23,7 +21,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CInitGUIApp2App)
public:
virtual BOOL InitInstance() override;
virtual BOOL InitInstance();
//}}AFX_VIRTUAL
// Implementation

8
jp2_pc/Source/InitGUIApp2/InitGUIApp2Dlg.h
View File

@ -1,5 +1,3 @@
#pragma once
// InitGUIApp2Dlg.h : header file
//
@ -22,7 +20,7 @@ public:
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CInitGUIApp2Dlg)
protected:
virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
@ -31,10 +29,10 @@ protected:
// Generated message map functions
//{{AFX_MSG(CInitGUIApp2Dlg)
virtual BOOL OnInitDialog() override;
virtual BOOL OnInitDialog();
afx_msg void OnPaint();
afx_msg HCURSOR OnQueryDragIcon();
virtual void OnOK() override;
virtual void OnOK();
afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
afx_msg void OnCheckStuffChildren();

2
jp2_pc/Source/InitGUIApp2/Resource.h
View File

@ -1,5 +1,3 @@
#pragma once
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by InitGUIApp2.rc

2
jp2_pc/Source/InitGUIApp2/StdAfx.h
View File

@ -1,5 +1,3 @@
#pragma once
// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently, but
// are changed infrequently

12
jp2_pc/Source/Lib/Audio/AudioADPCM.hpp
View File

@ -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) override;
virtual uint32 u4DecompressMono8bit(uint8* pu1_dst, uint32 u4_byte_count);
//******************************************************************************************
// 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) override;
virtual uint32 u4DecompressMono16bit(uint8* pu1_dst, uint32 u4_byte_count);
//******************************************************************************************
// 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) override;
virtual uint32 u4DecompressStereo8bit(uint8* pu1_dst, uint32 u4_byte_count);
//******************************************************************************************
// 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) override;
virtual uint32 u4DecompressStereo16bit(uint8* pu1_dst, uint32 u4_byte_count);
//******************************************************************************************
// 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) override;
virtual void SetSampleSource(uint8* pu1_src, uint32 u4_src_len);
//******************************************************************************************
// get the number of bytes remaining in the current block, or 0 if none.
//
virtual uint32 u4GetRemainingData() override;
virtual uint32 u4GetRemainingData();
};

18
jp2_pc/Source/Lib/Audio/AudioDaemon.hpp
View File

@ -361,17 +361,17 @@ public:
//******************************************************************************************
// The messages that we respond to.
//
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;
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);
//*****************************************************************************************
char* pcSave(char* pc) const override;
char* pcSave(char* pc) const;
//*****************************************************************************************
const char* pcLoad(const char* pc) override;
const char* pcLoad(const char* pc);
//*****************************************************************************************
char *pcSaveSample
@ -390,7 +390,7 @@ public:
//*****************************************************************************************
//
void SaveDefaults() override;
void SaveDefaults();
//
// Save the default values of the user modifiable settings.
//
@ -398,7 +398,7 @@ public:
//*****************************************************************************************
//
void RestoreDefaults() override;
void RestoreDefaults();
//
// Restore the default values of the user modifiable settings.
//

12
jp2_pc/Source/Lib/Audio/AudioPCM.hpp
View File

@ -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) override
virtual uint32 u4DecompressMono8bit(uint8* pu1_dst, uint32 u4_byte_count)
{
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) override
virtual uint32 u4DecompressMono16bit(uint8* pu1_dst, uint32 u4_byte_count)
{
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) override
virtual uint32 u4DecompressStereo8bit(uint8* pu1_dst, uint32 u4_byte_count)
{
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) override
virtual uint32 u4DecompressStereo16bit(uint8* pu1_dst, uint32 u4_byte_count)
{
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) override
virtual void SetSampleSource(uint8* pu1_src, uint32 u4_src_len)
{
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() override
virtual uint32 u4GetRemainingData()
{
return u4SourceDataSize;
}

4
jp2_pc/Source/Lib/Control/Control.hpp
View File

@ -193,8 +193,8 @@ public:
//
// Message that we need to process
//
void Process(const CMessageStep& msg_step) override;
void Process(const CMessageSystem& msg_system) override;
void Process(const CMessageStep& msg_step);
void Process(const CMessageSystem& msg_system);
// start and stop input capture, initial state is not captured
void Capture(bool b_state = true);

24
jp2_pc/Source/Lib/EntityDBase/Animal.hpp
View File

@ -193,14 +193,14 @@ public:
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
//*****************************************************************************************
virtual char * pcSave(char * pc_buffer) const override;
virtual char * pcSave(char * pc_buffer) const;
//*****************************************************************************************
virtual const char * pcLoad(const char * pc_buffer) override;
virtual const char * pcLoad(const char * pc_buffer);
//
@ -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 override; // Makes a copy of this
) const; // Makes a copy of this
//
// Identifier functions.
//
//*****************************************************************************************
virtual void Cast(CAnimal** ppani) override
virtual void Cast(CAnimal** ppani)
{
*ppani = this;
}

36
jp2_pc/Source/Lib/EntityDBase/Animate.hpp
View File

@ -296,7 +296,7 @@ public:
//
virtual bool bCanHaveChildren
(
) override;
);
//
// Returns 'false.'
//
@ -430,27 +430,27 @@ public:
//*****************************************************************************************
virtual int iGetTeam() const override;
virtual int iGetTeam() const;
//*****************************************************************************************
virtual const CAnimate* paniGetOwner() const override;
virtual const CAnimate* paniGetOwner() const;
//*****************************************************************************************
virtual const CBoundVol* pbvBoundingVol() const override;
virtual const CBoundVol* pbvBoundingVol() const;
//*****************************************************************************************
virtual CInstance* pinsCopy() const override;
virtual CInstance* pinsCopy() const;
#if VER_TEST
//*****************************************************************************************
virtual int iGetDescription(char *buffer, int i_buffer_length) override;
virtual int iGetDescription(char *buffer, int i_buffer_length);
#endif
//*****************************************************************************************
virtual char * pcSave(char * pc_buffer) const override;
virtual char * pcSave(char * pc_buffer) const;
//*****************************************************************************************
virtual const char * pcLoad(const char * pc_buffer) override;
virtual const char * pcLoad(const char * pc_buffer);
//
// 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) override
virtual void Cast(CAnimate** ppant)
{
*ppant = this;
}
@ -589,15 +589,15 @@ public:
//
//*****************************************************************************************
virtual int iGetTeam() const override;
virtual int iGetTeam() const;
//*****************************************************************************************
virtual const CAnimate* paniGetOwner() const override;
virtual const CAnimate* paniGetOwner() const;
//*****************************************************************************************
virtual CInstance* pinsCopy() const override;
virtual CInstance* pinsCopy() const;
virtual void Cast(CBoundaryBox** ppbb) override
virtual void Cast(CBoundaryBox** ppbb)
{
*ppbb = this;
}

6
jp2_pc/Source/Lib/EntityDBase/AnimationScript.hpp
View File

@ -255,13 +255,13 @@ public:
//
//*****************************************************************************************
virtual void Process(const CMessageStep&) override;
virtual void Process(const CMessageStep&);
//*****************************************************************************************
virtual char * pcSave(char * pc_buffer) const override;
virtual char * pcSave(char * pc_buffer) const;
//*****************************************************************************************
virtual const char * pcLoad(const char * pc_buffer) override;
virtual const char * pcLoad(const char * pc_buffer);
};
// Single global instance.

4
jp2_pc/Source/Lib/EntityDBase/CameraPrime.hpp
View File

@ -83,8 +83,8 @@ public:
//
//*****************************************************************************************
virtual void Process(const CMessagePaint&) override;
virtual void Process(const CMessageSystem&) override;
virtual void Process(const CMessagePaint&);
virtual void Process(const CMessageSystem&);
};
// Single global instance.

14
jp2_pc/Source/Lib/EntityDBase/Entity.hpp
View File

@ -185,14 +185,14 @@ public:
//
//lint -save -e1411
virtual void Cast(CEntity** ppet) override
virtual void Cast(CEntity** ppet)
{
*ppet = this;
}
//lint -restore
//*****************************************************************************************
virtual const char* strPartType() const override;
virtual const char* strPartType() const;
};
@ -287,20 +287,20 @@ public:
// Overrides.
//
void Move(const CPlacement3<>& p3_new, CEntity* pet_sender = 0) override;
void Move(const CPlacement3<>& p3_new, CEntity* pet_sender = 0);
// Respond to move messages by moving myself if my parent moves.
void Process(const CMessageMove& msgmove) override;
void Process(const CMessageMove& msgmove);
//*****************************************************************************************
virtual char * pcSave(char * pc_buffer) const override;
virtual char * pcSave(char * pc_buffer) const;
//*****************************************************************************************
virtual const char * pcLoad(const char * pc_buffer) override;
virtual const char * pcLoad(const char * pc_buffer);
//*****************************************************************************************
virtual const char* strPartType() const override;
virtual const char* strPartType() const;
//protected:
// How can we update attached guys when we aren't in run mode if this is protected?

14
jp2_pc/Source/Lib/EntityDBase/EntityLight.hpp
View File

@ -81,10 +81,10 @@ public:
//
// Invalidate shadow buffer when objects added.
void Process(const CMessageCreate& msgcreate) override; //lint !e1411 //Yes, this had the same name as other functions.
void Process(const CMessageCreate& msgcreate); //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) override;
void Move(const CPlacement3<>& p3_new, CEntity* pet_sender = 0);
//******************************************************************************************
//
@ -107,25 +107,25 @@ public:
//
//*****************************************************************************************
virtual bool bIncludeInBuildPart() const override
virtual bool bIncludeInBuildPart() const
{
return false;
}
//*****************************************************************************************
virtual bool bCanHaveChildren() override
virtual bool bCanHaveChildren()
{
return false;
}
//*****************************************************************************************
virtual const char* strPartType() const override;
virtual const char* strPartType() const;
//*****************************************************************************************
virtual char * pcSave(char * pc_buffer) const override;
virtual char * pcSave(char * pc_buffer) const;
//*****************************************************************************************
virtual const char * pcLoad(const char * pc_buffer) override;
virtual const char * pcLoad(const char * pc_buffer);
};

56
jp2_pc/Source/Lib/EntityDBase/Instance.hpp
View File

@ -784,61 +784,61 @@ public:
//
//*****************************************************************************************
virtual float fDistanceFromGlobalCameraSqr() const override;
virtual float fDistanceFromGlobalCameraSqr() const;
//*****************************************************************************************
virtual CPresence3<> pr3Presence() const override;
virtual CPresence3<> pr3Presence() const;
//*****************************************************************************************
virtual void SetPresence(const CPresence3<> &pr3) override;
virtual void SetPresence(const CPresence3<> &pr3);
//*****************************************************************************************
virtual CPlacement3<> p3Placement() const override;
virtual CPlacement3<> p3Placement() const;
//*****************************************************************************************
virtual void SetPlacement(const CPlacement3<> &p3) override;
virtual void SetPlacement(const CPlacement3<> &p3);
//*****************************************************************************************
virtual CVector3<> v3Pos() const override;
virtual CVector3<> v3Pos() const;
//*****************************************************************************************
virtual void SetPos(const CVector3<>& v3_pos) override;
virtual void SetPos(const CVector3<>& v3_pos);
//*****************************************************************************************
virtual CRotate3<> r3Rot() const override;
virtual CRotate3<> r3Rot() const;
//*****************************************************************************************
virtual void SetRot(const CRotate3<>& r3_rot) override;
virtual void SetRot(const CRotate3<>& r3_rot);
//*****************************************************************************************
virtual float fGetScale() const override;
virtual float fGetScale() const;
//*****************************************************************************************
virtual void SetScale(float f_new_scale) override;
virtual void SetScale(float f_new_scale);
//*****************************************************************************************
virtual void Move(const CPlacement3<>& p3_new, CEntity* pet_sender = 0) override;
virtual void Move(const CPlacement3<>& p3_new, CEntity* pet_sender = 0);
//*****************************************************************************************
virtual rptr_const<CRenderType> prdtGetRenderType() const override;
virtual rptr_const<CRenderType> prdtGetRenderType() const;
//*****************************************************************************************
virtual rptr<CShape> pshGetShape() const override;
virtual rptr<CShape> pshGetShape() const;
//*****************************************************************************************
virtual rptr<CMesh> pmshGetMesh() const override;
virtual rptr<CMesh> pmshGetMesh() const;
//*****************************************************************************************
virtual bool bContainsMovingObject() const override;
virtual bool bContainsMovingObject() const;
//*****************************************************************************************
virtual void Cast(CInstance** ppins) override
virtual void Cast(CInstance** ppins)
{
*ppins = this;
}
//*****************************************************************************************
virtual const CBoundVol* pbvBoundingVol() const override;
virtual const CBoundVol* pbvBoundingVol() const;
//*****************************************************************************************
@ -1015,7 +1015,7 @@ public:
//
virtual bool bIsMoving
(
) const override;
) const;
//
// 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 override;
) const;
//
// Returns a partition type string.
//
@ -1045,7 +1045,7 @@ public:
//
virtual bool bEmptyPart
(
) const override
) const
//
// Returns 'true' if the partition is empty, otherwise returns 'false.'
//
@ -1059,7 +1059,7 @@ public:
//*****************************************************************************************
//
virtual bool bIsInstance() const override
virtual bool bIsInstance() const
//
// 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) override;
virtual bool bPreload(const CBoundVol* pbv, const CPresence3<>* pr3, bool b_is_contained = false);
//
// Preloads object into memory.
//
@ -1171,7 +1171,7 @@ public:
//
virtual uint32 u4GetUniqueHandle
(
) const override;
) const;
//
// Returns a value uniquely representing the object.
//
@ -1193,7 +1193,7 @@ public:
virtual char * pcSave
(
char * pc_buffer
) const override;
) const;
//
// 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() override
virtual bool bIsBackdrop()
{
return true;
}

7
jp2_pc/Source/Lib/EntityDBase/MessageTypes.hpp
View File

@ -131,14 +131,13 @@
*
**********************************************************************************************/
#ifndef HEADER_LIB_ENTITYDBASE_MESSAGETYPES_HPP
#define HEADER_LIB_ENTITYDBASE_MESSAGETYPES_HPP
#error MessageTypes.hpp is now obsolete! Use MessageTypes/foo.hpp
#if 0
#ifndef HEADER_LIB_ENTITYDBASE_MESSAGETYPES_HPP
#define HEADER_LIB_ENTITYDBASE_MESSAGETYPES_HPP
#include "Lib/EntityDBase/Entity.hpp"
#include "Lib/EntityDBase/Message.hpp"

6
jp2_pc/Source/Lib/EntityDBase/MessageTypes/MsgAudio.hpp
View File

@ -245,7 +245,7 @@ public:
}
//*****************************************************************************************
virtual void Queue() const override;
virtual void Queue() const;
//*****************************************************************************************
//
@ -278,14 +278,14 @@ public:
protected:
//*****************************************************************************************
//
void DeliverTo(CEntity* pet) const override
void DeliverTo(CEntity* pet) const
{
pet->Process(*this);
}
//*****************************************************************************************
//
const char* strName() const override
const char* strName() const
{
return "Audio";
}

6
jp2_pc/Source/Lib/EntityDBase/MessageTypes/MsgCollision.hpp
View File

@ -190,16 +190,16 @@ protected:
//
//******************************************************************************************
virtual void Send() const override;
virtual void Send() const;
//******************************************************************************************
virtual void DeliverTo(CEntity* pet) const override
virtual void DeliverTo(CEntity* pet) const
{
pet->Process(*this);
}
//******************************************************************************************
virtual const char* strName() const override
virtual const char* strName() const
{
return "Collision";
}

16
jp2_pc/Source/Lib/EntityDBase/MessageTypes/MsgControl.hpp
View File

@ -73,12 +73,12 @@ protected:
// Overrides.
//
void DeliverTo(CEntity* pet) const override { pet->Process(*this); }
const char* strName() const override { return "Control"; }
void DeliverTo(CEntity* pet) const { pet->Process(*this); }
const char* strName() const { return "Control"; }
//******************************************************************************************
//
virtual void Send() const override;
virtual void Send() const;
//
// Send this message.
//
@ -90,7 +90,7 @@ protected:
//******************************************************************************************
//
virtual void ExtractReplayData() const override;
virtual void ExtractReplayData() const;
//
// Extract replay data specific to this message
//
@ -142,20 +142,20 @@ protected:
//
//******************************************************************************************
virtual void DeliverTo(CEntity* pet) const override
virtual void DeliverTo(CEntity* pet) const
{
pet->Process(*this);
}
//******************************************************************************************
virtual const char* strName() const override
virtual const char* strName() const
{
return "NewRaster";
}
//******************************************************************************************
//
virtual void Send() const override;
virtual void Send() const;
//
// Send this message.
//
@ -167,7 +167,7 @@ protected:
//******************************************************************************************
//
virtual void ExtractReplayData() const override;
virtual void ExtractReplayData() const;
//
// Extract replay data specific to this message
//

4
jp2_pc/Source/Lib/EntityDBase/MessageTypes/MsgCreate.hpp
View File

@ -63,13 +63,13 @@ protected:
//
//******************************************************************************************
virtual void DeliverTo(CEntity* pet) const override
virtual void DeliverTo(CEntity* pet) const
{
pet->Process(*this);
}
//******************************************************************************************
virtual const char* strName() const override
virtual const char* strName() const
{
return "Create";
}

Some files were not shown because too many files have changed in this diff Show More