-

Author: codenamecpp

src/GameDefs.h

@@ -27,6 +27,8 @@
 #define CAR_WHEEL_SIZE_W_PX         6
 #define CAR_WHEEL_SIZE_H_PX         12
 
+#define GTA_CYCLES_PER_FRAME        24
+
 // in original gta1 map height levels is counting from top to bottom - 
 // 0 is highest and 5 is lowest level
 #define INVERT_MAP_LAYER(index) (MAP_LAYERS_COUNT - (index) - 1)
@@ -74,6 +76,8 @@ struct GameObjectStyle
     float mHeight = 0.0f;
     float mDepth = 0.0f;
 
+    int mLifeDuration = 0; // 0 for infinite, non-zero n for n animation cycles
+
     SpriteAnimData mAnimationData; // optional
 };
 

src/GameObjectsManager.cpp

@@ -155,17 +155,16 @@ Decoration* GameObjectsManager::CreateDecoration(const glm::vec3& position, cxx:
     debug_assert(gGameMap.mStyleData.IsLoaded());
     debug_assert(desc);
     debug_assert(desc->mClassID == eGameObjectClass_Decoration);
-    if (desc->mClassID == eGameObjectClass_Decoration)
-    {
-        GameObjectID objectID = GenerateUniqueID();
 
-        instance = mDecorationsPool.create(objectID, desc);
-        debug_assert(instance);
+    GameObjectID objectID = GenerateUniqueID();
 
-        mAllObjectsList.push_back(instance);
-        // init
-        instance->Spawn(position, heading);
-    }
+    instance = mDecorationsPool.create(objectID, desc);
+    debug_assert(instance);
+
+    mAllObjectsList.push_back(instance);
+    // init
+    instance->Spawn(position, heading);
+    instance->SetLifeDuration(desc->mLifeDuration);
     return instance;
 }
 

src/SpriteManager.cpp

@@ -302,7 +302,7 @@ void SpriteManager::InitBlocksAnimations()
     {
         BlockAnimation animData;
         animData.mBlockIndex = cityStyle.GetBlockTextureLinearIndex((currAnim.mWhich == 0 ? eBlockType_Side : eBlockType_Lid), currAnim.mBlock);
-        animData.mAnimDesc.mFramesPerSecond = (20.0f / currAnim.mSpeed);
+        animData.mAnimDesc.mFramesPerSecond = (GTA_CYCLES_PER_FRAME * 1.0f) / currAnim.mSpeed;
         animData.mAnimDesc.mFramesCount = currAnim.mFrameCount + 1;
         animData.mAnimDesc.mFrames[0] = animData.mBlockIndex; // initial frame
         for (int iframe = 0; iframe < currAnim.mFrameCount; ++iframe)

src/StyleData.cpp

@@ -1061,6 +1061,7 @@ bool StyleData::InitGameObjectsList()
     {
         GameObjectStyle& currObject = mGameObjects[icurr];
         currObject.mGameObjectIndex = icurr;
+        currObject.mLifeDuration = 0;
 
         ObjectRawData& objectRaw = mObjectsRaw[icurr];
 
@@ -1080,25 +1081,29 @@ bool StyleData::InitGameObjectsList()
         int frameCount = 0;
         cxx::json_get_attribute(currObjectNode, "frameCount", frameCount);
 
-        if (frameCount > 0)
-        {
-            int startSpriteIndex = GetSpriteIndex(eSpriteType_Object, objectRaw.mBaseSprite);
-            currObject.mAnimationData.Setup(startSpriteIndex, frameCount);
-        }
-
         ParseObjectFlags(currObjectNode, "flags", currObject.mFlags);
 
-        // convert object dimensions pixels to meters
-        
-        // todo: 
+        int startSpriteIndex = GetSpriteIndex(eSpriteType_Object, objectRaw.mBaseSprite);
+
         // as cds says, 
         // Animated objects are a special case. They cannot be involved in collisions and are there for graphical
         //    effect only. The same data structure is used, with the following differences :
         //      * height - stores the number of game cycles per frame
         //      * width - stores the number of frames
         //      * depth - stores a life descriptor ( 0 for infinite, non-zero n for n animation cycles )
-        if (currObject.mClassID != eGameObjectClass_Decoration)
+        if (objectRaw.mStatus == 5)
         {
+            float fps = (GTA_CYCLES_PER_FRAME * 1.0f) / objectRaw.mHeight;
+            currObject.mAnimationData.Setup(startSpriteIndex, objectRaw.mWidth, fps);
+            currObject.mLifeDuration = objectRaw.mDepth;
+        }
+        else
+        {
+            if (frameCount > 0)
+            {
+                currObject.mAnimationData.Setup(startSpriteIndex, frameCount);
+            }
+            // convert object dimensions pixels to meters
             currObject.mHeight = Convert::PixelsToMeters(objectRaw.mHeight);
             currObject.mWidth = Convert::PixelsToMeters(objectRaw.mWidth);
             currObject.mDepth = Convert::PixelsToMeters(objectRaw.mDepth);

src/TimeManager.h

@@ -15,7 +15,7 @@ class TimeManager: public cxx::noncopyable
     float mUiFrameDelta = 0.0f;
     float mUiTimeScale = 1.0f;
 
-    float mMinFramerate = 25.0f; // gta1 game speed
+    float mMinFramerate = 24.0f; // gta1 game speed
     float mMaxFramerate = 120.0f;
 
 public: