implemented vef object (mostly)

gemrb/core/GameData.cpp

@@ -41,6 +41,7 @@
 #include "Spell.h"
 #include "SpellMgr.h"
 #include "StoreMgr.h"
+#include "VEFObject.h"
 #include "Scriptable/Actor.h"
 #include "System/FileStream.h"
 
@@ -431,6 +432,29 @@ ScriptedAnimation* GameData::GetScriptedAnimation( const char *effect, bool doub
 	return ret;
 }
 
+VEFObject* GameData::GetVEFObject(const char *effect, bool doublehint)
+{
+	VEFObject *ret = NULL;
+
+	if (Exists( effect, IE_VEF_CLASS_ID, true ) ) {
+		DataStream *ds = GetResource( effect, IE_VEF_CLASS_ID );
+		ret = new VEFObject();
+		strnlwrcpy(ret->ResName, effect, 8);
+		ret->LoadVEF(ds);
+	} else {
+		if (Exists( effect, IE_2DA_CLASS_ID, true ) ) {
+			ret = new VEFObject();
+			ret->Load2DA(effect);
+		} else {
+			ScriptedAnimation *sca = GetScriptedAnimation(effect, doublehint);
+			if (sca) {
+				ret = new VEFObject(sca);
+			}
+		}
+	}
+	return ret;
+}
+
 // Return single BAM frame as a sprite. Use if you want one frame only,
 // otherwise it's not efficient
 Sprite2D* GameData::GetBAMSprite(const ieResRef ResRef, int cycle, int frame, bool silent)

gemrb/core/GameData.h

@@ -47,8 +47,9 @@ class Palette;
 class ScriptedAnimation;
 class Spell;
 class Sprite2D;
-class TableMgr;
 class Store;
+class TableMgr;
+class VEFObject;
 
 struct Table {
 	Holder<TableMgr> tm;
@@ -95,6 +96,9 @@ class GEM_EXPORT GameData : public ResourceManager
 	/** creates a vvc/bam animation object at point */
 	ScriptedAnimation* GetScriptedAnimation( const char *ResRef, bool doublehint);
 
+	/** creates a composite vef/2da animation */
+	VEFObject* GetVEFObject( const char *ResRef, bool doublehint);
+
 	/** returns a single sprite (not cached) from a BAM resource */
 	Sprite2D* GetBAMSprite(const ieResRef ResRef, int cycle, int frame, bool silent=false);
 

gemrb/core/GameScript/GSUtils.cpp

@@ -40,6 +40,7 @@
 #include "StringMgr.h"
 #include "TableMgr.h"
 #include "TileMap.h"
+#include "VEFObject.h"
 #include "Video.h"
 #include "WorldMap.h"
 #include "GUI/GameControl.h"
@@ -806,7 +807,7 @@ void CreateVisualEffectCore(Scriptable *Sender, const Point &position, const cha
 	if (vvc) {
 		vvc->XPos +=position.x;
 		vvc->YPos +=position.y;
-		Sender->GetCurrentArea( )->AddVVCell( vvc );
+		Sender->GetCurrentArea( )->AddVVCell( new VEFObject(vvc) );
 	}
 }
 

gemrb/core/Interface.cpp

@@ -67,6 +67,7 @@
 #include "StringMgr.h"
 #include "SymbolMgr.h"
 #include "TileMap.h"
+#include "VEFObject.h"
 #include "Video.h"
 #include "WindowMgr.h"
 #include "WorldMapMgr.h"
@@ -2252,6 +2253,9 @@ const char* Interface::TypeExt(SClass_ID type) const
 		case IE_VAR_CLASS_ID:
 			return "var";
 
+		case IE_VEF_CLASS_ID:
+			return "vef";
+
 		case IE_VVC_CLASS_ID:
 			return "vvc";
 
@@ -2266,6 +2270,9 @@ const char* Interface::TypeExt(SClass_ID type) const
 
 		case IE_WMP_CLASS_ID:
 			return "wmp";
+
+		default:
+			Log(ERROR, "Interface", "No extension associated to class ID: %lu", (unsigned long) type );
 	}
 	return NULL;
 }
@@ -2769,7 +2776,7 @@ Actor *Interface::SummonCreature(const ieResRef resource, const ieResRef vvcres,
 				vvc->YPos=ab->Pos.y;
 				//force vvc to play only once
 				vvc->PlayOnce();
-				map->AddVVCell( vvc );
+				map->AddVVCell( new VEFObject(vvc) );
 
 				//set up the summon disable effect
 				Effect *newfx = EffectQueue::CreateEffect(fx_summon_disable_ref, 0, 1, FX_DURATION_ABSOLUTE);

gemrb/core/Map.cpp

@@ -43,6 +43,7 @@
 #include "SaveGameIterator.h"
 #include "ScriptedAnimation.h"
 #include "TileMap.h"
+#include "VEFObject.h"
 #include "Video.h"
 #include "WorldMap.h"
 #include "strrefs.h"
@@ -105,7 +106,7 @@ void Map::ReleaseMemory()
 	}
 }
 
-static inline AnimationObjectType SelectObject(Actor *actor, int q, AreaAnimation *a, ScriptedAnimation *sca, Particles *spark, Projectile *pro, Container *pile)
+static inline AnimationObjectType SelectObject(Actor *actor, int q, AreaAnimation *a, VEFObject *sca, Particles *spark, Projectile *pro, Container *pile)
 {
 	int actorh;
 	if (actor) {
@@ -632,10 +633,12 @@ void Map::DrawPortal(InfoPoint *ip, int enable)
 		if (sca) {
 			sca->SetBlend();
 			sca->PlayOnce();
-			sca->XPos=ip->Pos.x;
-			sca->YPos=ip->Pos.y;
-			sca->ZPos=gotportal;
-			AddVVCell(sca);
+			//exact position, because HasVVCCell depends on the coordinates, PST had no coordinate offset anyway
+			sca->XPos = ip->Pos.x;
+			sca->YPos = ip->Pos.y;
+			//this is actually ordered by time, not by height
+			sca->ZPos = gotportal;
+			AddVVCell( new VEFObject(sca));
 		}
 		return;
 	}
@@ -1101,7 +1104,7 @@ ieDword Map::GetTrapCount(proIterator &iter)
 
 
 //doesn't increase iterator, because we might need to erase it from the list
-ScriptedAnimation *Map::GetNextScriptedAnimation(scaIterator &iter)
+VEFObject *Map::GetNextScriptedAnimation(scaIterator &iter)
 {
 	if (iter==vvcCells.end()) {
 		return NULL;
@@ -1172,7 +1175,7 @@ void Map::DrawMap(Region screen)
 	Container *pile = GetNextPile(pileidx);
 
 	AreaAnimation *a = GetNextAreaAnimation(aniidx, gametime);
-	ScriptedAnimation *sca = GetNextScriptedAnimation(scaidx);
+	VEFObject *sca = GetNextScriptedAnimation(scaidx);
 	Projectile *pro = GetNextProjectile(proidx);
 	Particles *spark = GetNextSpark(spaidx);
 
@@ -2162,16 +2165,21 @@ ieDword Map::HasVVCCell(const ieResRef resource, const Point &p)
 			if ((*iter)->YPos!=p.y) continue;
 		}
 		if (strnicmp(resource, (*iter)->ResName, sizeof(ieResRef) )) continue;
-		ieDword tmp = (*iter)->GetSequenceDuration(AI_UPDATE_TIME)-(*iter)->GetCurrentFrame();
-		if (tmp>ret) {
-			ret = tmp;
+		ScriptedAnimation *sca = (*iter)->GetSingleObject();
+		if (sca) {
+			ieDword tmp = sca->GetSequenceDuration(AI_UPDATE_TIME)-sca->GetCurrentFrame();
+			if (tmp>ret) {
+				ret = tmp;
+			}
+		} else {
+			ret = 1;
 		}
 	}
 	return ret;
 }
 
 //adding videocell in order, based on its height parameter
-void Map::AddVVCell(ScriptedAnimation* vvc)
+void Map::AddVVCell(VEFObject* vvc)
 {
 	scaIterator iter;
 

gemrb/core/Map.h

@@ -46,6 +46,7 @@ class Projectile;
 class ScriptedAnimation;
 class SpriteCover;
 class TileMap;
+class VEFObject;
 class Wall_Polygon;
 
 //distance of actors from spawn point
@@ -241,7 +242,7 @@ enum AnimationObjectType {AOT_AREA, AOT_SCRIPTED, AOT_ACTOR, AOT_SPARK, AOT_PROJ
 #define PR_IGNORE  2
 
 typedef std::list<AreaAnimation*>::iterator aniIterator;
-typedef std::list<ScriptedAnimation*>::iterator scaIterator;
+typedef std::list<VEFObject*>::iterator scaIterator;
 typedef std::list<Projectile*>::iterator proIterator;
 typedef std::list<Particles*>::iterator spaIterator;
 
@@ -280,7 +281,7 @@ class GEM_EXPORT Map : public Scriptable {
 	std::vector< Actor*> actors;
 	Wall_Polygon **Walls;
 	unsigned int WallCount;
-	std::list< ScriptedAnimation*> vvcCells;
+	std::list< VEFObject*> vvcCells;
 	std::list< Projectile*> projectiles;
 	std::list< Particles*> particles;
 	std::vector< Entrance*> entrances;
@@ -397,7 +398,7 @@ class GEM_EXPORT Map : public Scriptable {
 
 	//returns the duration of a VVC cell set in the area (point may be set to empty)
 	ieDword HasVVCCell(const ieResRef resource, const Point &p);
-	void AddVVCell(ScriptedAnimation* vvc);
+	void AddVVCell(VEFObject* vvc);
 	bool CanFree();
 	int GetCursor( const Point &p);
 	//adds a sparkle puff of colour to a point in the area
@@ -508,7 +509,7 @@ class GEM_EXPORT Map : public Scriptable {
 private:
 	AreaAnimation *GetNextAreaAnimation(aniIterator &iter, ieDword gametime);
 	Particles *GetNextSpark(spaIterator &iter);
-	ScriptedAnimation *GetNextScriptedAnimation(scaIterator &iter);
+	VEFObject *GetNextScriptedAnimation(scaIterator &iter);
 	Actor *GetNextActor(int &q, int &index);
 	Container *GetNextPile (int &index) const;
 	void DrawPile (Region screen, int pileidx);

gemrb/core/Projectile.cpp

@@ -30,9 +30,10 @@
 #include "Image.h"
 #include "Interface.h"
 #include "ProjectileServer.h"
-#include "Scriptable/Actor.h"
 #include "Sprite2D.h"
+#include "VEFObject.h"
 #include "Video.h"
+#include "Scriptable/Actor.h"
 
 #include <cmath>
 #include <cstdlib>
@@ -757,10 +758,19 @@ void Projectile::EndTravel()
 	}
 }
 
+//Note: trails couldn't be higher than VVC, but this shouldn't be a problem
 int Projectile::AddTrail(ieResRef BAM, const ieByte *pal)
 {
-	ScriptedAnimation *sca=gamedata->GetScriptedAnimation(BAM,0);
+/*
+	VEFObject *vef=gamedata->GetVEFObject(BAM,0);
+	if (!vef) return 0;
+	ScriptedAnimation *sca=vef->GetSingleObject();
 	if (!sca) return 0;
+*/
+	ScriptedAnimation* sca=gamedata->GetScriptedAnimation(BAM,0);
+	if (!sca) return 0;
+	VEFObject *vef = new VEFObject(sca);
+
 	if(pal) {
 		if (ExtFlags & PEF_TINT) {
 			Color tmpColor[PALSIZE];
@@ -779,7 +789,7 @@ int Projectile::AddTrail(ieResRef BAM, const ieByte *pal)
 	sca->SetBlend();
 	sca->XPos += Pos.x;
 	sca->YPos += Pos.y;
-	area->AddVVCell(sca);
+	area->AddVVCell(vef);
 	return sca->GetSequenceDuration(AI_UPDATE_TIME);
 }
 
@@ -1407,6 +1417,7 @@ void Projectile::DrawExplosion(const Region &screen)
 	if (phase==P_EXPLODING1) {
 		core->GetAudioDrv()->Play(Extension->SoundRes, Pos.x, Pos.y);
 		//play VVC in center
+		//FIXME: make it possible to play VEF too?
 		if (aoeflags&PAF_VVC) {
 			ScriptedAnimation* vvc = gamedata->GetScriptedAnimation(Extension->VVCRes, false);
 			if (vvc) {
@@ -1430,7 +1441,8 @@ void Projectile::DrawExplosion(const Region &screen)
 				vvc->YPos+=Pos.y;
 				vvc->PlayOnce();
 				vvc->SetBlend();
-				area->AddVVCell(vvc);
+				//quick hack to use the single object envelope
+				area->AddVVCell(new VEFObject(vvc));
 			}
 		}