Merge branch 'vanilla' into fixes/zounds

TheAssemblyArmada · Jun 25, 2024 · 8e30952 · 8e30952
2 parents a1caa7b + 69c2455
commit 8e30952
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/common/file.cpp b/common/file.cpp
@@ -13,9 +13,8 @@ static void Resolve_File_Single(char* fname)
     }
 
     size_t name_len = strlen(fname);
-    size_t full_len = strlen(ffblk->GetFullName());
 
-    if (ffblk->FindFirst(fname) && name_len == full_len) {
+    if (ffblk->FindFirst(fname) && name_len == strlen(ffblk->GetFullName())) {
         strncpy(fname, ffblk->GetFullName(), name_len + 1);
     }
 

diff --git a/tiberiandawn/cdata.cpp b/tiberiandawn/cdata.cpp
@@ -837,11 +837,11 @@ static TemplateTypeClass const Boulder3(TEMPLATE_BOULDER3,
                                         LAND_ROCK,
                                         NULL);
 static TemplateTypeClass const
-    Boulder4(TEMPLATE_BOULDER4, THEATERF_TEMPERATE, "B4", TXT_SLOPE, LAND_ROCK, 1, 1, LAND_ROCK, NULL);
+    Boulder4(TEMPLATE_BOULDER4, THEATERF_DESERT, "B4", TXT_SLOPE, LAND_ROCK, 1, 1, LAND_ROCK, NULL);
 static TemplateTypeClass const
-    Boulder5(TEMPLATE_BOULDER5, THEATERF_TEMPERATE, "B5", TXT_SLOPE, LAND_ROCK, 1, 1, LAND_ROCK, NULL);
+    Boulder5(TEMPLATE_BOULDER5, THEATERF_DESERT, "B5", TXT_SLOPE, LAND_ROCK, 1, 1, LAND_ROCK, NULL);
 static TemplateTypeClass const
-    Boulder6(TEMPLATE_BOULDER6, THEATERF_TEMPERATE, "B6", TXT_SLOPE, LAND_ROCK, 1, 1, LAND_ROCK, NULL);
+    Boulder6(TEMPLATE_BOULDER6, THEATERF_DESERT, "B6", TXT_SLOPE, LAND_ROCK, 1, 1, LAND_ROCK, NULL);
 static TemplateTypeClass const Slope1(TEMPLATE_SLOPE1,
                                       THEATERF_WINTER | THEATERF_DESERT | THEATERF_TEMPERATE,
                                       "S01",