Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

cleaned up unused code

  • Loading branch information...
commit d800a2f3c88769d72d1c05e7b6b9021116507621 1 parent d84df10
@AvengerTeamBG AvengerTeamBG authored
Showing with 0 additions and 50 deletions.
  1. +0 −44 gemrb/core/VEFObject.cpp
  2. +0 −6 gemrb/core/VEFObject.h
View
44 gemrb/core/VEFObject.cpp
@@ -43,8 +43,6 @@ VEFObject::VEFObject()
ZPos=0;
ResName[0]=0;
SingleObject=false;
- Blend=false;
- PlayOne=false;
}
VEFObject::VEFObject(ScriptedAnimation *sca)
@@ -54,8 +52,6 @@ VEFObject::VEFObject(ScriptedAnimation *sca)
ZPos=sca->ZPos; //sometimes this is not an actual ZPos - PST portals, don't use it for rendering?
ResName[0]=0;
SingleObject=true;
- //Blend=false;
- //PlayOne=false;
ScheduleEntry entry;
entry.start = core->GetGame()->GameTime;
if (sca->Duration==0xffffffff) entry.length = 0xffffffff;
@@ -282,46 +278,6 @@ void VEFObject::LoadVEF(DataStream *stream)
}
}
-/*
-void VEFObject::SetBlend()
-{
- Blend=true;
-}
-
-void VEFObject::PlayOnce()
-{
- PlayOne=true;
-}
-*/
-//works only with single objects
-/*
-ieDword VEFObject::GetSequenceDuration(ieDword multiplier)
-{
- std::list<ScheduleEntry>::iterator iter;
-
- for(iter=entries.begin();iter!=entries.end();iter++) {
- if ( (*iter).type==VEF_VVC || (*iter).type==VEF_BAM ) {
- ScriptedAnimation *sca = (ScriptedAnimation *) (*iter).ptr;
- if (sca) return sca->GetSequenceDuration(multiplier);
- }
- }
- return 0;
-}
-
-ieDword VEFObject::GetCurrentFrame()
-{
- std::list<ScheduleEntry>::iterator iter;
-
- for(iter=entries.begin();iter!=entries.end();iter++) {
- if ( (*iter).type==VEF_VVC || (*iter).type==VEF_BAM ) {
- ScriptedAnimation *sca = (ScriptedAnimation *) (*iter).ptr;
- if (sca) return sca->GetCurrentFrame();
- }
- }
- return 0;
-}
-*/
-
ScriptedAnimation *VEFObject::GetSingleObject()
{
ScriptedAnimation *sca = NULL;
View
6 gemrb/core/VEFObject.h
@@ -48,8 +48,6 @@ class GEM_EXPORT VEFObject {
public:
ieResRef ResName;
int XPos, YPos, ZPos;
- bool Blend;
- bool PlayOne;
VEFObject();
VEFObject(ScriptedAnimation *sca);
~VEFObject();
@@ -63,10 +61,6 @@ class GEM_EXPORT VEFObject {
bool Draw(const Region &screen, Point &position, const Color &p_tint, Map *area, int dither, int orientation, int height);
void Load2DA(const ieResRef resource);
void LoadVEF(DataStream *stream);
- //void SetBlend();
- //void PlayOnce();
- //ieDword GetSequenceDuration(ieDword multiplier);
- //ieDword GetCurrentFrame();
ScriptedAnimation *GetSingleObject();
private:
//clears the schedule, used internally

0 comments on commit d800a2f

Please sign in to comment.
Something went wrong with that request. Please try again.