* position for creature is now obtainable from Creature class

* creatures that are offscreen are now hidden from battle window

gamecontent/creature.cpp

@@ -55,10 +55,11 @@ void Creature::setSquare(uint32_t color)
 	m_squareStartTime = g_frameTime;
 }
 
-void Creature::setMoving(const Position& oldPos)
+void Creature::setMoving(const Position& oldPos, const Position& newPos)
 {
 	m_moveStartTime = g_frameTime;
 	m_moveOldPos = oldPos;
+	m_currentPos = newPos;
 }
 
 //*********** Creatures *************

gamecontent/creature.h

@@ -50,7 +50,7 @@ class Creature :  public CreatureUI, public Thing
 	uint32_t getSquareColor() const { return m_squareColor;}
 	uint32_t getSquareStart() const { return m_squareStartTime;}
 
-	void setMoving(const Position& oldPos);
+	void setMoving(const Position& oldPos, const Position& newPos);
 
 	void setId(uint32_t id){ m_id = id;}
 	uint32_t getId() const { return m_id;}
@@ -85,6 +85,8 @@ class Creature :  public CreatureUI, public Thing
 	void setShield(uint32_t shield) { m_shield = shield;}
 	uint32_t getShield() const { return m_shield;}
 
+	const Position& getCurrentPos() const { return m_currentPos; } 
+	void setCurrentPos(const Position& pos) { m_currentPos = pos; }
 
 	void resetSelf() { CreatureUI::resetSelf(); m_id = 0; }
 protected:
@@ -109,6 +111,8 @@ class Creature :  public CreatureUI, public Thing
 
 	uint32_t m_moveStartTime;
 	Position m_moveOldPos;
+
+	Position m_currentPos;
 
 	friend class Creatures;
 };

gamecontent/map.cpp

@@ -292,6 +292,11 @@ bool Tile::addThing(Thing *thing, bool pushThing/* = false*/)
 	}
 
 	m_objects.insert(it, thing);
+
+	Creature *c = thing->getCreature();
+	if(c){
+		c->setCurrentPos(this->getPos());
+	}
 	return true;
 }
 

gm_gameworld.cpp

@@ -464,6 +464,10 @@ void GM_Gameworld::updateScene()
     }
 
 
+	// update battle window
+	// FIXME (ivucica#1#): someone should move refreshVisibility() into some notifications asap.
+#warning EXTREMELY EXTREMELY bad idea to update this every frame. It works but RebuildList()ing so often is bound to be very slow due to abudance of SetPos() calls inside GLICT (ivucica)
+	sbvlPanel.winBattle.refreshVisibility();
 
 
     // status messages

net/protocolgame.cpp

@@ -551,7 +551,7 @@ bool ProtocolGame::parseCreatureMove(NetworkMessage& msg)
 
     Notifications::onCreatureMove(creature->getId(),oldPos,newPos);
 
-    creature->setMoving(oldPos);
+    creature->setMoving(oldPos, newPos);
 
     //update creature direction
     if(oldPos.x > newPos.x){

ui/battlewindow.cpp

@@ -87,6 +87,31 @@ void winBattle_t::remove(uint32_t id)
 		}
 	}
 }
+void winBattle_t::refreshVisibility()
+{
+	std::vector<BattleEntry*>::iterator it;
+	Position player = GlobalVariables::getPlayerPosition();
+
+	for(it = entries.begin(); it != entries.end(); ++it)
+	{
+		Creature *c = Creatures::getInstance().getCreature((*it)->creatureId);
+		if (!c) continue;
+		Position p = c->getCurrentPos();
+
+		// FIXME (ivucica#5#): we should somehow query MapUI if the other creature is in visible area... concluding it ourselves is not a good way of handling stuff
+		if (abs(int(p.x - player.x)) < 9 &&
+			abs(int(p.y - player.y)) < 7 &&
+			p.z == player.z &&
+			c->getHealth() > 0) {
+			(*it)->pnl.SetVisible(true);
+		} else
+		{
+			(*it)->pnl.SetVisible(false);
+		}
+	}
+	list.RebuildList();
+
+}
 
 void winBattle_t::paintEntry(glictRect *real, glictRect *clipped, glictContainer *caller)
 {

ui/battlewindow.h

@@ -79,6 +79,7 @@ class winBattle_t : public yatcStackPanelWindow
 	void add(uint32_t id);
 	void update(uint32_t id);
 	void remove(uint32_t id);
+	void refreshVisibility();
 
 	virtual float GetDefaultHeight(){ return 40.F; }
 	virtual void OnClose();