Rename SDrawStaticStruct -> StaticDrawableWrapper.

Pavel Kovalenko · Pavel Kovalenko · commit e86bd6026fb9 · 2014-10-04T20:49:58.000+04:00
diff --git a/res/gamedata/scripts/lua_help.script b/res/gamedata/scripts/lua_help.script
@@ -838,7 +838,7 @@ C++ class color {
 
 };
 
-C++ class SDrawStaticStruct {
+C++ class StaticDrawableWrapper {
     property m_endTime;
     
     function wnd();
diff --git a/src/xrGame/ActorInput.cpp b/src/xrGame/ActorInput.cpp
@@ -179,7 +179,7 @@ void CActor::IR_OnKeyboardPress(int cmd)
 						inventory().ClientEat		(itm);
 					}
 					
-					SDrawStaticStruct* _s		= CurrentGameUI()->AddCustomStatic("item_used", true);
+					StaticDrawableWrapper* _s		= CurrentGameUI()->AddCustomStatic("item_used", true);
 					string1024					str;
 					strconcat					(sizeof(str),str,*CStringTable().translate("st_item_used"),": ", itm->NameItem());
 					_s->wnd()->TextItemControl()->SetText(str);
diff --git a/src/xrGame/UIGameCustom.cpp b/src/xrGame/UIGameCustom.cpp
@@ -24,7 +24,7 @@ struct predicate_find_stat
 {
     const char* id;
     predicate_find_stat(const char* id) { this->id = id; }
-    bool operator()(SDrawStaticStruct* s)
+    bool operator()(StaticDrawableWrapper* s)
     {
         return s->m_name == id;
     }
@@ -55,7 +55,7 @@ void CUIGameCustom::OnFrame()
     CDialogHolder::OnFrame();
     for (auto item : CustomStatics)
         item->Update();
-    auto comparer = [](const SDrawStaticStruct* s1, const SDrawStaticStruct* s2)
+    auto comparer = [](const StaticDrawableWrapper* s1, const StaticDrawableWrapper* s2)
     {
         return s1->IsActual() > s2->IsActual();
     };
@@ -79,7 +79,7 @@ void CUIGameCustom::OnFrame()
 
 void CUIGameCustom::Render()
 {
-    for (SDrawStaticStruct* item : CustomStatics)
+    for (StaticDrawableWrapper* item : CustomStatics)
         item->Draw();
     Window->Draw();
     CEntity* pEntity = smart_cast<CEntity*>(Level().CurrentEntity());
@@ -105,7 +105,7 @@ void CUIGameCustom::Render()
     DoRenderDialogs();
 }
 
-SDrawStaticStruct* CUIGameCustom::AddCustomStatic(const char* id, bool singleInstance)
+StaticDrawableWrapper* CUIGameCustom::AddCustomStatic(const char* id, bool singleInstance)
 {
     if (singleInstance)
     {
@@ -114,8 +114,8 @@ SDrawStaticStruct* CUIGameCustom::AddCustomStatic(const char* id, bool singleIns
             return *it;
     }
     CUIXmlInit xmlInit;
-    CustomStatics.push_back(xr_new<SDrawStaticStruct>());
-    SDrawStaticStruct* sss = CustomStatics.back();
+    CustomStatics.push_back(xr_new<StaticDrawableWrapper>());
+    StaticDrawableWrapper* sss = CustomStatics.back();
     sss->m_static = xr_new<CUIStatic>();
     sss->m_name = id;
     xmlInit.InitStatic(*MsgConfig, id, 0, sss->m_static);
@@ -125,7 +125,7 @@ SDrawStaticStruct* CUIGameCustom::AddCustomStatic(const char* id, bool singleIns
     return sss;
 }
 
-SDrawStaticStruct* CUIGameCustom::GetCustomStatic(const char* id)
+StaticDrawableWrapper* CUIGameCustom::GetCustomStatic(const char* id)
 {
     auto it = std::find_if(CustomStatics.begin(), CustomStatics.end(), predicate_find_stat(id));
     if (it != CustomStatics.end())
@@ -270,25 +270,25 @@ void CUIGameCustom::enable_fake_indicators(bool enable)
     UIMainIngameWnd->get_hud_states()->EnableFakeIndicators(enable);
 }
 
-SDrawStaticStruct::SDrawStaticStruct()
+StaticDrawableWrapper::StaticDrawableWrapper()
 {
     m_static = nullptr;
     m_endTime = -1.0f;
 }
 
-void SDrawStaticStruct::destroy()
+void StaticDrawableWrapper::destroy()
 {
     delete_data(m_static);
 }
 
-bool SDrawStaticStruct::IsActual() const
+bool StaticDrawableWrapper::IsActual() const
 {
     if (m_endTime < 0)
         return true;
     return Device.fTimeGlobal < m_endTime;
 }
 
-void SDrawStaticStruct::SetText(const char* text)
+void StaticDrawableWrapper::SetText(const char* text)
 {
     m_static->Show(text != nullptr);
     if (text)
@@ -298,13 +298,13 @@ void SDrawStaticStruct::SetText(const char* text)
     }
 }
 
-void SDrawStaticStruct::Draw()
+void StaticDrawableWrapper::Draw()
 {
     if (m_static->IsShown())
         m_static->Draw();
 }
 
-void SDrawStaticStruct::Update()
+void StaticDrawableWrapper::Update()
 {
     if (IsActual() && m_static->IsShown())
         m_static->Update();
diff --git a/src/xrGame/UIGameCustom.h b/src/xrGame/UIGameCustom.h
@@ -21,13 +21,14 @@ struct KillMessageStruct;
 class CUIMainIngameWnd;
 class CUIMessagesWindow;
 
-struct SDrawStaticStruct : public IPureDestroyableObject
+struct StaticDrawableWrapper : public IPureDestroyableObject
 {
-    SDrawStaticStruct();
-    virtual	void destroy();
     CUIStatic* m_static;
     float m_endTime;
     shared_str m_name;
+
+    StaticDrawableWrapper();
+    virtual	void destroy();
     void Draw();
     void Update();
     CUIStatic* wnd() { return m_static; }
@@ -81,7 +82,7 @@ class CUIGameCustom :
 protected:
     CUIWindow* Window;
     CUIXml* MsgConfig;
-    xr_vector<SDrawStaticStruct*> CustomStatics;
+    xr_vector<StaticDrawableWrapper*> CustomStatics;
     CUIActorMenu* ActorMenu;
     CUIPdaWnd* PdaMenu;
     bool showGameIndicators;
@@ -111,8 +112,8 @@ class CUIGameCustom :
     void ShowCrosshair(bool show) { psHUD_Flags.set(HUD_CROSSHAIR_RT, show); }
     bool CrosshairShown() { return !!psHUD_Flags.test(HUD_CROSSHAIR_RT); }    
     virtual void HideShownDialogs() {}
-    SDrawStaticStruct* AddCustomStatic(const char* id, bool singleInstance);
-    SDrawStaticStruct* GetCustomStatic(const char* id);
+    StaticDrawableWrapper* AddCustomStatic(const char* id, bool singleInstance);
+    StaticDrawableWrapper* GetCustomStatic(const char* id);
     void RemoveCustomStatic(const char* id);
     void CommonMessageOut(const char* text);
     virtual void ChangeTotalMoneyIndicator(const char* newMoneyString) {}
diff --git a/src/xrGame/UIGameCustom_script.cpp b/src/xrGame/UIGameCustom_script.cpp
@@ -14,9 +14,9 @@ void CUIGameCustom::script_register(lua_State *L)
 {
 	module(L)
 		[
-			class_< SDrawStaticStruct >("SDrawStaticStruct")
-			.def_readwrite("m_endTime",		&SDrawStaticStruct::m_endTime)
-			.def("wnd",					&SDrawStaticStruct::wnd),
+			class_< StaticDrawableWrapper >("StaticDrawableWrapper")
+			.def_readwrite("m_endTime",		&StaticDrawableWrapper::m_endTime)
+			.def("wnd",					&StaticDrawableWrapper::wnd),
 
 			class_< CUIGameCustom >("CUIGameCustom")
 			.def("AddDialogToRender",		&CUIGameCustom::AddDialogToRender)
diff --git a/src/xrGame/UIGameSP.cpp b/src/xrGame/UIGameSP.cpp
@@ -133,7 +133,7 @@ bool CUIGameSP::IR_UIOnKeyboardPress(int dik)
 
 			if ( t1 && t1->m_Description.c_str() )
 			{
-				SDrawStaticStruct* sm2		= AddCustomStatic("secondary_task", true);
+				StaticDrawableWrapper* sm2		= AddCustomStatic("secondary_task", true);
 				sm2->m_static->TextItemControl()->SetTextST	(t1->m_Description.c_str());
 			}
 		}break;
diff --git a/src/xrGame/UIGameSP.h b/src/xrGame/UIGameSP.h
@@ -40,7 +40,7 @@ class CUIGameSP : public CUIGameCustom
 	CUITalkWnd*			TalkMenu;
 	CChangeLevelWnd*	UIChangeLevelWnd;
 
-	SDrawStaticStruct*	m_game_objective;
+	StaticDrawableWrapper*	m_game_objective;
 };
 
 
diff --git a/src/xrGame/ai/monsters/basemonster/base_monster_feel.cpp b/src/xrGame/ai/monsters/basemonster/base_monster_feel.cpp
@@ -107,7 +107,7 @@ void CBaseMonster::HitEntity(const CEntity *pEntity, float fDamage, float impuls
 		if (pEntityNC == Actor() && draw_hit_marks) {
 			START_PROFILE("BaseMonster/Animation/HitEntity");
 
-			SDrawStaticStruct* s = CurrentGameUI()->AddCustomStatic("monster_claws", false);
+			StaticDrawableWrapper* s = CurrentGameUI()->AddCustomStatic("monster_claws", false);
 			
 			float h1,p1;
 			Device.vCameraDirection.getHP	(h1,p1);
diff --git a/src/xrGame/ai/monsters/controller/controller.cpp b/src/xrGame/ai/monsters/controller/controller.cpp
@@ -437,7 +437,7 @@ void CController::UpdateCL()
 		
 		if (percent < TEXTURE_SIZE_PERCENT ) {
 			CurrentGameUI()->RemoveCustomStatic("controller_fx2");
-			SDrawStaticStruct* s = CurrentGameUI()->AddCustomStatic("controller_fx", true);
+			StaticDrawableWrapper* s = CurrentGameUI()->AddCustomStatic("controller_fx", true);
 			
 			float x1 = Device.dwWidth  / 2 - ((Device.dwWidth	/ 2) * percent);
 			float y1 = Device.dwHeight / 2 - ((Device.dwHeight	/ 2) * percent);
@@ -447,7 +447,7 @@ void CController::UpdateCL()
 			s->wnd()->SetWndRect				(Frect().set(x1,y1,x2-x1,y2-y1));
 		} else if (percent2 > 0){
 			CurrentGameUI()->RemoveCustomStatic("controller_fx");
-			SDrawStaticStruct* s = CurrentGameUI()->AddCustomStatic("controller_fx2", true);
+			StaticDrawableWrapper* s = CurrentGameUI()->AddCustomStatic("controller_fx2", true);
 			
 			float x1 = Device.dwWidth  / 2 - ((Device.dwWidth	/ 2) * percent2);
 			float y1 = Device.dwHeight / 2 - ((Device.dwHeight	/ 2) * percent2);
diff --git a/src/xrGame/console_commands.cpp b/src/xrGame/console_commands.cpp
@@ -570,7 +570,7 @@ class CCC_ALifeSave : public IConsole_Command {
 #ifdef DEBUG
 		Msg						("Game save overhead  : %f milliseconds",timer.GetElapsed_sec()*1000.f);
 #endif
-		SDrawStaticStruct* _s		= CurrentGameUI()->AddCustomStatic("game_saved", true);
+		StaticDrawableWrapper* _s		= CurrentGameUI()->AddCustomStatic("game_saved", true);
 		LPSTR						save_name;
 		STRCONCAT					(save_name, CStringTable().translate("st_game_saved").c_str(), ": ", S);
 		_s->wnd()->TextItemControl()->SetText(save_name);
diff --git a/src/xrGame/game_cl_mp.cpp b/src/xrGame/game_cl_mp.cpp
@@ -513,7 +513,7 @@ void game_cl_mp::OnWarnMessage(NET_Packet* P)
 		{
 			string512					_buff;
 			xr_sprintf					(_buff,"max_ping_warn_%d", _cnt);
-			SDrawStaticStruct* ss		= CurrentGameUI()->AddCustomStatic(_buff, true);
+			StaticDrawableWrapper* ss		= CurrentGameUI()->AddCustomStatic(_buff, true);
 			
 			xr_sprintf					(_buff,"%d ms.", _ping);
 			ss->m_static->TextItemControl()->SetText	(_buff);

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ void CActor::IR_OnKeyboardPress(int cmd)`
`179`	`179`	`inventory().ClientEat (itm);`
`180`	`180`	`}`
`181`	`181`
`182`		`- SDrawStaticStruct* _s = CurrentGameUI()->AddCustomStatic("item_used", true);`
	`182`	`+ StaticDrawableWrapper* _s = CurrentGameUI()->AddCustomStatic("item_used", true);`
`183`	`183`	`string1024 str;`
`184`	`184`	`strconcat (sizeof(str),str,*CStringTable().translate("st_item_used"),": ", itm->NameItem());`
`185`	`185`	`_s->wnd()->TextItemControl()->SetText(str);`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ struct predicate_find_stat`
`24`	`24`	`{`
`25`	`25`	`const char* id;`
`26`	`26`	`predicate_find_stat(const char* id) { this->id = id; }`
`27`		`- bool operator()(SDrawStaticStruct* s)`
	`27`	`+ bool operator()(StaticDrawableWrapper* s)`
`28`	`28`	`{`
`29`	`29`	`return s->m_name == id;`
`30`	`30`	`}`
`@@ -55,7 +55,7 @@ void CUIGameCustom::OnFrame()`
`55`	`55`	`CDialogHolder::OnFrame();`
`56`	`56`	`for (auto item : CustomStatics)`
`57`	`57`	`item->Update();`
`58`		`- auto comparer = [](const SDrawStaticStruct* s1, const SDrawStaticStruct* s2)`
	`58`	`+ auto comparer = [](const StaticDrawableWrapper* s1, const StaticDrawableWrapper* s2)`
`59`	`59`	`{`
`60`	`60`	`return s1->IsActual() > s2->IsActual();`
`61`	`61`	`};`
`@@ -79,7 +79,7 @@ void CUIGameCustom::OnFrame()`
`79`	`79`
`80`	`80`	`void CUIGameCustom::Render()`
`81`	`81`	`{`
`82`		`- for (SDrawStaticStruct* item : CustomStatics)`
	`82`	`+ for (StaticDrawableWrapper* item : CustomStatics)`
`83`	`83`	`item->Draw();`
`84`	`84`	`Window->Draw();`
`85`	`85`	`CEntity* pEntity = smart_cast<CEntity*>(Level().CurrentEntity());`
`@@ -105,7 +105,7 @@ void CUIGameCustom::Render()`
`105`	`105`	`DoRenderDialogs();`
`106`	`106`	`}`
`107`	`107`
`108`		`-SDrawStaticStruct* CUIGameCustom::AddCustomStatic(const char* id, bool singleInstance)`
	`108`	`+StaticDrawableWrapper* CUIGameCustom::AddCustomStatic(const char* id, bool singleInstance)`
`109`	`109`	`{`
`110`	`110`	`if (singleInstance)`
`111`	`111`	`{`
`@@ -114,8 +114,8 @@ SDrawStaticStruct* CUIGameCustom::AddCustomStatic(const char* id, bool singleIns`
`114`	`114`	`return *it;`
`115`	`115`	`}`
`116`	`116`	`CUIXmlInit xmlInit;`
`117`		`- CustomStatics.push_back(xr_new<SDrawStaticStruct>());`
`118`		`- SDrawStaticStruct* sss = CustomStatics.back();`
	`117`	`+ CustomStatics.push_back(xr_new<StaticDrawableWrapper>());`
	`118`	`+ StaticDrawableWrapper* sss = CustomStatics.back();`
`119`	`119`	`sss->m_static = xr_new<CUIStatic>();`
`120`	`120`	`sss->m_name = id;`
`121`	`121`	`xmlInit.InitStatic(*MsgConfig, id, 0, sss->m_static);`
`@@ -125,7 +125,7 @@ SDrawStaticStruct* CUIGameCustom::AddCustomStatic(const char* id, bool singleIns`
`125`	`125`	`return sss;`
`126`	`126`	`}`
`127`	`127`
`128`		`-SDrawStaticStruct* CUIGameCustom::GetCustomStatic(const char* id)`
	`128`	`+StaticDrawableWrapper* CUIGameCustom::GetCustomStatic(const char* id)`
`129`	`129`	`{`
`130`	`130`	`auto it = std::find_if(CustomStatics.begin(), CustomStatics.end(), predicate_find_stat(id));`
`131`	`131`	`if (it != CustomStatics.end())`
`@@ -270,25 +270,25 @@ void CUIGameCustom::enable_fake_indicators(bool enable)`
`270`	`270`	`UIMainIngameWnd->get_hud_states()->EnableFakeIndicators(enable);`
`271`	`271`	`}`
`272`	`272`
`273`		`-SDrawStaticStruct::SDrawStaticStruct()`
	`273`	`+StaticDrawableWrapper::StaticDrawableWrapper()`
`274`	`274`	`{`
`275`	`275`	`m_static = nullptr;`
`276`	`276`	`m_endTime = -1.0f;`
`277`	`277`	`}`
`278`	`278`
`279`		`-void SDrawStaticStruct::destroy()`
	`279`	`+void StaticDrawableWrapper::destroy()`
`280`	`280`	`{`
`281`	`281`	`delete_data(m_static);`
`282`	`282`	`}`
`283`	`283`
`284`		`-bool SDrawStaticStruct::IsActual() const`
	`284`	`+bool StaticDrawableWrapper::IsActual() const`
`285`	`285`	`{`
`286`	`286`	`if (m_endTime < 0)`
`287`	`287`	`return true;`
`288`	`288`	`return Device.fTimeGlobal < m_endTime;`
`289`	`289`	`}`
`290`	`290`
`291`		`-void SDrawStaticStruct::SetText(const char* text)`
	`291`	`+void StaticDrawableWrapper::SetText(const char* text)`
`292`	`292`	`{`
`293`	`293`	`m_static->Show(text != nullptr);`
`294`	`294`	`if (text)`
`@@ -298,13 +298,13 @@ void SDrawStaticStruct::SetText(const char* text)`
`298`	`298`	`}`
`299`	`299`	`}`
`300`	`300`
`301`		`-void SDrawStaticStruct::Draw()`
	`301`	`+void StaticDrawableWrapper::Draw()`
`302`	`302`	`{`
`303`	`303`	`if (m_static->IsShown())`
`304`	`304`	`m_static->Draw();`
`305`	`305`	`}`
`306`	`306`
`307`		`-void SDrawStaticStruct::Update()`
	`307`	`+void StaticDrawableWrapper::Update()`
`308`	`308`	`{`
`309`	`309`	`if (IsActual() && m_static->IsShown())`
`310`	`310`	`m_static->Update();`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ void CUIGameCustom::script_register(lua_State *L)`
`14`	`14`	`{`
`15`	`15`	`module(L)`
`16`	`16`	`[`
`17`		`- class_< SDrawStaticStruct >("SDrawStaticStruct")`
`18`		`- .def_readwrite("m_endTime", &SDrawStaticStruct::m_endTime)`
`19`		`- .def("wnd", &SDrawStaticStruct::wnd),`
	`17`	`+ class_< StaticDrawableWrapper >("StaticDrawableWrapper")`
	`18`	`+ .def_readwrite("m_endTime", &StaticDrawableWrapper::m_endTime)`
	`19`	`+ .def("wnd", &StaticDrawableWrapper::wnd),`
`20`	`20`
`21`	`21`	`class_< CUIGameCustom >("CUIGameCustom")`
`22`	`22`	`.def("AddDialogToRender", &CUIGameCustom::AddDialogToRender)`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ bool CUIGameSP::IR_UIOnKeyboardPress(int dik)`
`133`	`133`
`134`	`134`	`if ( t1 && t1->m_Description.c_str() )`
`135`	`135`	`{`
`136`		`- SDrawStaticStruct* sm2 = AddCustomStatic("secondary_task", true);`
	`136`	`+ StaticDrawableWrapper* sm2 = AddCustomStatic("secondary_task", true);`
`137`	`137`	`sm2->m_static->TextItemControl()->SetTextST (t1->m_Description.c_str());`
`138`	`138`	`}`
`139`	`139`	`}break;`