Merge pull request #2185 from ericoporto/fix-precache-only-walk-of-pl…

…ayer Engine: precache only player walk view
adventuregamestudio · Oct 18, 2023 · bf088d5 · bf088d5
2 parents 93c3f7f + 20c7e57
commit bf088d5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Engine/ac/viewframe.cpp b/Engine/ac/viewframe.cpp
@@ -105,12 +105,13 @@ int ViewFrame_GetFrame(ScriptViewFrame *svf) {
 
 //=============================================================================
 
-void precache_view(int view) 
+void precache_view(int view, int max_loops)
 {
     if (view < 0) 
         return;
 
-    for (int i = 0; i < views[view].numLoops; i++) {
+    max_loops = std::min(views[view].numLoops, max_loops);
+    for (int i = 0; i < max_loops; i++) {
         for (int j = 0; j < views[view].loops[i].numFrames; j++)
             spriteset.Precache(views[view].loops[i].frames[j].pic);
     }

diff --git a/Engine/ac/viewframe.h b/Engine/ac/viewframe.h
@@ -39,7 +39,7 @@ int  ViewFrame_GetView(ScriptViewFrame *svf);
 int  ViewFrame_GetLoop(ScriptViewFrame *svf);
 int  ViewFrame_GetFrame(ScriptViewFrame *svf);
 
-void precache_view(int view);
+void precache_view(int view, int max_loops = INT_MAX);
 // Calculate the frame sound volume from different factors;
 // pass scale as 100 if volume scaling is disabled
 // NOTE: historically scales only in 0-100 range :/

diff --git a/Engine/main/engine.cpp b/Engine/main/engine.cpp
@@ -642,7 +642,7 @@ void engine_init_game_settings()
     }
     // may as well preload the character gfx
     if (playerchar->view >= 0)
-        precache_view (playerchar->view);
+        precache_view (playerchar->view, Character_GetDiagonalWalking(playerchar) ? 8 : 4);
 
     our_eip=-6;