diff --git a/neo/framework/DeclEntityDef.cpp b/neo/framework/DeclEntityDef.cpp index 15725642..f5689b78 100644 --- a/neo/framework/DeclEntityDef.cpp +++ b/neo/framework/DeclEntityDef.cpp @@ -148,6 +148,6 @@ idDeclEntityDef::Print Dumps all key/value pairs, including inherited ones ================ */ -void idDeclEntityDef::Print( void ) { +void idDeclEntityDef::Print( void ) const { dict.Print(); } diff --git a/neo/framework/DeclEntityDef.h b/neo/framework/DeclEntityDef.h index 2630f9ae..dd82d0e6 100644 --- a/neo/framework/DeclEntityDef.h +++ b/neo/framework/DeclEntityDef.h @@ -45,7 +45,7 @@ public: virtual const char * DefaultDefinition() const; virtual bool Parse( const char *text, const int textLength ); virtual void FreeData( void ); - virtual void Print( void ); + virtual void Print( void ) const; }; #endif /* !__DECLENTITYDEF_H__ */ diff --git a/neo/renderer/Model.cpp b/neo/renderer/Model.cpp index 9c975292..0fa278a5 100644 --- a/neo/renderer/Model.cpp +++ b/neo/renderer/Model.cpp @@ -2238,7 +2238,7 @@ void idRenderModelStatic::WriteToDemoFile( class idDemoFile *f ) { idRenderModelStatic::IsLoaded ================ */ -bool idRenderModelStatic::IsLoaded( void ) { +bool idRenderModelStatic::IsLoaded( void ) const { return !purged; } diff --git a/neo/renderer/Model.h b/neo/renderer/Model.h index 419a64ed..da6aa272 100644 --- a/neo/renderer/Model.h +++ b/neo/renderer/Model.h @@ -208,7 +208,7 @@ public: virtual void LoadModel() = 0; // internal use - virtual bool IsLoaded() = 0; + virtual bool IsLoaded() const = 0; virtual void SetLevelLoadReferenced( bool referenced ) = 0; virtual bool IsLevelLoadReferenced() = 0; diff --git a/neo/renderer/Model_local.h b/neo/renderer/Model_local.h index f566761f..c3cfd9b9 100644 --- a/neo/renderer/Model_local.h +++ b/neo/renderer/Model_local.h @@ -50,7 +50,7 @@ public: virtual void PurgeModel(); virtual void Reset() {}; virtual void LoadModel(); - virtual bool IsLoaded(); + virtual bool IsLoaded() const; virtual void SetLevelLoadReferenced( bool referenced ); virtual bool IsLevelLoadReferenced(); virtual void TouchData(); diff --git a/neo/ui/GameBearShootWindow.cpp b/neo/ui/GameBearShootWindow.cpp index 6fc85b54..66e20415 100644 --- a/neo/ui/GameBearShootWindow.cpp +++ b/neo/ui/GameBearShootWindow.cpp @@ -536,15 +536,6 @@ void idGameBearShootWindow::Draw(int time, float x, float y) { } } -/* -============================= -idGameBearShootWindow::Activate -============================= -*/ -const char *idGameBearShootWindow::Activate(bool activate) { - return ""; -} - /* ============================= idGameBearShootWindow::UpdateTurret diff --git a/neo/ui/GameBearShootWindow.h b/neo/ui/GameBearShootWindow.h index 07afc0a2..faa08ea3 100644 --- a/neo/ui/GameBearShootWindow.h +++ b/neo/ui/GameBearShootWindow.h @@ -78,7 +78,6 @@ public: virtual const char* HandleEvent(const sysEvent_t *event, bool *updateVisuals); virtual void PostParse(); virtual void Draw(int time, float x, float y); - virtual const char* Activate(bool activate); virtual idWinVar * GetWinVarByName (const char *_name, bool winLookup = false, drawWin_t** owner = NULL); private: diff --git a/neo/ui/GameBustOutWindow.cpp b/neo/ui/GameBustOutWindow.cpp index 523aec14..9e10d1c3 100644 --- a/neo/ui/GameBustOutWindow.cpp +++ b/neo/ui/GameBustOutWindow.cpp @@ -771,16 +771,6 @@ void idGameBustOutWindow::Draw(int time, float x, float y) { } } -/* -============================= -idGameBustOutWindow::Activate -============================= -*/ -const char *idGameBustOutWindow::Activate(bool activate) { - return ""; -} - - /* ============================= idGameBustOutWindow::UpdateScore diff --git a/neo/ui/GameBustOutWindow.h b/neo/ui/GameBustOutWindow.h index 30b757a1..592e270c 100644 --- a/neo/ui/GameBustOutWindow.h +++ b/neo/ui/GameBustOutWindow.h @@ -120,7 +120,6 @@ public: virtual const char* HandleEvent(const sysEvent_t *event, bool *updateVisuals); virtual void PostParse(); virtual void Draw(int time, float x, float y); - virtual const char* Activate(bool activate); virtual idWinVar * GetWinVarByName (const char *_name, bool winLookup = false, drawWin_t** owner = NULL); idList entities; diff --git a/neo/ui/MarkerWindow.cpp b/neo/ui/MarkerWindow.cpp index 056a9d3b..2ae61ac7 100644 --- a/neo/ui/MarkerWindow.cpp +++ b/neo/ui/MarkerWindow.cpp @@ -84,10 +84,6 @@ bool idMarkerWindow::ParseInternalVar(const char *_name, idParser *src) { return idWindow::ParseInternalVar(_name, src); } -idWinVar *idMarkerWindow::GetWinVarByName(const char *_name, bool fixup) { - return idWindow::GetWinVarByName(_name, fixup); -} - const char *idMarkerWindow::HandleEvent(const sysEvent_t *event, bool *updateVisuals) { if (!(event->evType == SE_KEY && event->evValue2)) { diff --git a/neo/ui/MarkerWindow.h b/neo/ui/MarkerWindow.h index f77b2af3..b839e222 100644 --- a/neo/ui/MarkerWindow.h +++ b/neo/ui/MarkerWindow.h @@ -42,7 +42,6 @@ public: idMarkerWindow(idDeviceContext *d, idUserInterfaceLocal *gui); virtual ~idMarkerWindow(); virtual size_t Allocated(){return idWindow::Allocated();}; - virtual idWinVar *GetWinVarByName(const char *_name, bool winLookup = false); virtual const char *HandleEvent(const sysEvent_t *event, bool *updateVisuals); virtual void PostParse();