Remove unused field

arx · Jul 17, 2017 · 75e5f38 · 75e5f38
1 parent 43a506c
commit 75e5f38
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 13 deletions.
diff --git a/src/game/Damage.cpp b/src/game/Damage.cpp
@@ -601,7 +601,7 @@ void ARX_DAMAGES_ForceDeath(Entity * io_dead, Entity * io_killer) {
 				ioo->show = SHOW_FLAG_IN_SCENE;
 				ioo->ioflags |= IO_NO_NPC_COLLIDE;
 				ioo->pos = ioo->obj->vertexWorldPositions[ioo->obj->origin].v;
-				ioo->stopped = 0;
+				// TODO old broken code suggested that physics sim might be enabled here
 			}
 		}
 	}

diff --git a/src/game/Entity.cpp b/src/game/Entity.cpp
@@ -133,7 +133,6 @@ Entity::Entity(const res::path & classPath, EntityInstance instance)
 	gameFlags = GFLAG_NEEDINIT | GFLAG_INTERACTIVITY;
 	fall = 0.f;
 
-	stopped = 1;
 	initpos = Vec3f_ZERO;
 	initangle = Anglef::ZERO;
 	scale = 1.f;

diff --git a/src/game/Entity.h b/src/game/Entity.h
@@ -296,7 +296,6 @@ class Entity {
 	GameFlags gameFlags;
 	float fall;
 
-	long stopped;
 	Vec3f initpos; // Initial Position
 	Anglef initangle; // Initial Angle
 	float scale;

diff --git a/src/game/Inventory.cpp b/src/game/Inventory.cpp
@@ -185,7 +185,6 @@ void PutInFrontOfPlayer(Entity * io)
 	io->pos += Vec3f(0.f, 20.f, 0.f);
 
 	io->angle = Anglef::ZERO;
-	io->stopped = 0;
 	io->show = SHOW_FLAG_IN_SCENE;
 
 	if(io->obj && io->obj->pbox) {

diff --git a/src/game/npc/Dismemberment.cpp b/src/game/npc/Dismemberment.cpp
@@ -258,8 +258,6 @@ static void ARX_NPC_SpawnMember(Entity * ioo, ObjSelection num) {
 	io->obj->pbox->active = 1;
 	io->obj->pbox->stopcount = 0;
 
-	io->stopped = 1;
-
 	Vec3f vector;
 	vector.x = -std::sin(glm::radians(io->angle.getYaw()));
 	vector.y = std::sin(glm::radians(io->angle.getPitch())) * 2.f;

diff --git a/src/gui/Cursor.cpp b/src/gui/Cursor.cpp
@@ -273,8 +273,6 @@ bool Manage3DCursor(Entity * io, bool simulate) {
 				io->obj->pbox->stopcount = 0;
 				io->pos = collidpos;
 
-				io->stopped = 1;
-
 				movev.x *= 0.0001f;
 				movev.y = 0.1f;
 				movev.z *= 0.0001f;
@@ -295,7 +293,6 @@ bool Manage3DCursor(Entity * io, bool simulate) {
 				io->angle.setYaw(270.f - angle.getYaw());
 				io->angle.setRoll(angle.getRoll());
 
-				io->stopped = 0;
 				io->show = SHOW_FLAG_IN_SCENE;
 				io->obj->pbox->active = 0;
 				Set_DragInter(NULL);

diff --git a/src/gui/Interface.cpp b/src/gui/Interface.cpp
@@ -2086,7 +2086,6 @@ void ArxGame::manageEditorControls() {
 						io->obj->pbox->active=1;
 						io->obj->pbox->stopcount=0;
 						io->pos = player.pos + Vec3f(0.f, 80.f, 0.f);
-						io->stopped = 1;
 
 						Vec2f centerOffset = Vec2f(DANAEMouse) - Vec2f(g_size.center());
 						Vec2f ratio;

diff --git a/src/scene/ChangeLevel.cpp b/src/scene/ChangeLevel.cpp
@@ -958,7 +958,7 @@ static long ARX_CHANGELEVEL_Push_IO(const Entity * io, long level) {
 	ais.collision = io->collision;
 	util::storeString(ais.mainevent, io->mainevent.c_str());
 	ais.velocity = Vec3f_ZERO;
-	ais.stopped = io->stopped;
+	ais.stopped = 0;
 	ais.basespeed = io->basespeed;
 	ais.speed_modif = io->speed_modif;
 	ais.frameloss = 0.f;
@@ -2033,7 +2033,6 @@ static Entity * ARX_CHANGELEVEL_Pop_IO(const std::string & idString, EntityInsta
 		io->mainevent = boost::to_lower_copy(util::loadString(ais->mainevent));
 
 		// Physics data
-		io->stopped = ais->stopped;
 		io->basespeed = 1;
 		io->speed_modif = 0.f; // TODO why are these not loaded from the savegame?
 		io->rubber = ais->rubber;

diff --git a/src/scene/Interactive.cpp b/src/scene/Interactive.cpp
@@ -2623,7 +2623,6 @@ void ARX_INTERACTIVE_ActivatePhysics(EntityHandle t)
 
 		io->obj->pbox->active = 1;
 		io->obj->pbox->stopcount = 0;
-		io->stopped = 1;
 		Vec3f fallvector = Vec3f(0.0f, 0.000001f, 0.f);
 		io->show = SHOW_FLAG_IN_SCENE;
 		io->soundtime = ArxInstant_ZERO;