From 0a9d4d3c7216f0232222cf9fb106518234c187df Mon Sep 17 00:00:00 2001
From: Relintai <relintai@gmail.com>
Date: Tue, 28 Apr 2020 19:03:17 +0200
Subject: [PATCH] Few more renames.

---
 doc_classes/Entity.xml |  8 ++++----
 entities/entity.cpp    | 24 ++++++++++++------------
 entities/entity.h      |  4 ++--
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/doc_classes/Entity.xml b/doc_classes/Entity.xml
index e2be41c..85d0b05 100644
--- a/doc_classes/Entity.xml
+++ b/doc_classes/Entity.xml
@@ -1132,7 +1132,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="cdie">
+		<method name="diec">
 			<return type="void">
 			</return>
 			<description>
@@ -3120,7 +3120,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="sdie">
+		<method name="dies">
 			<return type="void">
 			</return>
 			<description>
@@ -3894,7 +3894,7 @@
 			<description>
 			</description>
 		</signal>
-		<signal name="cdied">
+		<signal name="diecd">
 			<argument index="0" name="entity" type="Entity">
 			</argument>
 			<description>
@@ -4282,7 +4282,7 @@
 			<description>
 			</description>
 		</signal>
-		<signal name="sdied">
+		<signal name="diesd">
 			<argument index="0" name="entity" type="Entity">
 			</argument>
 			<description>
diff --git a/entities/entity.cpp b/entities/entity.cpp
index 510272a..a4f4bad 100644
--- a/entities/entity.cpp
+++ b/entities/entity.cpp
@@ -1821,22 +1821,22 @@ void Entity::set_stat(int index, Ref<Stat> entry) {
 	_stats.set(index, entry);
 }
 
-void Entity::sdie() {
+void Entity::dies() {
 	//serverside
 
 	son_death();
 
 	//send an event to client
-	VRPC(cdie);
+	VRPC(diec);
 
 	//signal
-	emit_signal("sdied", this);
+	emit_signal("diesd", this);
 }
 
-void Entity::cdie() {
+void Entity::diec() {
 	con_death();
 
-	emit_signal("cdied", this);
+	emit_signal("diecd", this);
 }
 
 void Entity::ons_stat_changed(Ref<Stat> stat) {
@@ -2393,7 +2393,7 @@ void Entity::stake_damage(Ref<SpellDamageInfo> info) {
 	VRPCOBJ12(cdamage_dealt_rpc, JSON::print(info->to_dict()), notification_cdamage, SpellEnums::NOTIFICATION_DAMAGE_DAMAGE_DEALT, info);
 
 	if (hp->get_current_value() <= 0) {
-		sdie();
+		dies();
 	}
 }
 
@@ -2420,7 +2420,7 @@ void Entity::sdeal_damage_to(Ref<SpellDamageInfo> info) {
 	ERR_FAIL_COND(!hp.is_valid());
 
 	if (hp->get_current_value() <= 0) {
-		sdie();
+		dies();
 	}
 }
 
@@ -5729,7 +5729,7 @@ Entity::Entity() {
 
 	SET_RPC_REMOTE("creceive_stat");
 
-	SET_RPC_REMOTE("cdie");
+	SET_RPC_REMOTE("diec");
 
 	//send_stat
 
@@ -6854,8 +6854,8 @@ void Entity::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("sentity_data_changed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "EntityData")));
 	ADD_SIGNAL(MethodInfo("centity_data_changed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "EntityData")));
 
-	ADD_SIGNAL(MethodInfo("sdied", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
-	ADD_SIGNAL(MethodInfo("cdied", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
+	ADD_SIGNAL(MethodInfo("diesd", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
+	ADD_SIGNAL(MethodInfo("diecd", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 
 	ADD_SIGNAL(MethodInfo("sentity_resource_added", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
 	ADD_SIGNAL(MethodInfo("sentity_resource_removed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
@@ -6887,8 +6887,8 @@ void Entity::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("ssend_stat", "id", "ccurrent", "cmax"), &Entity::ssend_stat);
 	ClassDB::bind_method(D_METHOD("creceive_stat", "id", "ccurrent", "cmax"), &Entity::creceive_stat);
 
-	ClassDB::bind_method(D_METHOD("sdie"), &Entity::sdie);
-	ClassDB::bind_method(D_METHOD("cdie"), &Entity::cdie);
+	ClassDB::bind_method(D_METHOD("dies"), &Entity::dies);
+	ClassDB::bind_method(D_METHOD("diec"), &Entity::diec);
 
 	ClassDB::bind_method(D_METHOD("ons_stat_changed", "stat"), &Entity::ons_stat_changed);
 	ClassDB::bind_method(D_METHOD("onc_stat_changed", "stat"), &Entity::onc_stat_changed);
diff --git a/entities/entity.h b/entities/entity.h
index ad39988..16134ea 100644
--- a/entities/entity.h
+++ b/entities/entity.h
@@ -342,8 +342,8 @@ public:
 	Ref<Stat> get_stat(int index);
 	void set_stat(int index, Ref<Stat> entry);
 
-	void sdie();
-	void cdie();
+	void dies();
+	void diec();
 
 	void ons_stat_changed(Ref<Stat> stat);
 	void onc_stat_changed(Ref<Stat> stat);