Merge branch 'master' into squid-hidden-walls-fix

Author: realSquidCoder

Creatures.cpp

@@ -424,14 +424,15 @@ void DrawCreatureText(int drawx, int drawy, Stonesense_Unit* creature )
             textcol = al_map_rgb(255,255,255);
         }
 
-        if (!creature->origin->name.nickname.empty() && ssConfig.config.names_use_nick) {
+        auto name = DFHack::Units::getVisibleName(creature->origin);
+        if (!name->nickname.empty() && ssConfig.config.names_use_nick) {
             draw_textf_border(stonesenseState.font, textcol, drawx, drawy-((WALLHEIGHT*ssConfig.scale)+fontHeight + offsety), 0,
-                              "%s", DF2UTF(creature->origin->name.nickname).c_str());
+                              "%s", DF2UTF(name->nickname).c_str());
         }
-        else if (!creature->origin->name.first_name.empty())
+        else if (!name->first_name.empty())
         {
             char buffer[128];
-            strncpy(buffer,creature->origin->name.first_name.c_str(),127);
+            strncpy(buffer,name->first_name.c_str(), 127);
             buffer[127]=0;
             ALLEGRO_USTR* temp = bufferToUstr(buffer, 128);
             al_ustr_set_chr(temp, 0, charToUpper(al_ustr_get(temp, 0)));

GUI.cpp

@@ -863,6 +863,10 @@ void DoSpriteIndexOverlay()
     paintboard();
 }
 
+float clockToMs(float clockTicks) {
+    return clockTicks / (CLOCKS_PER_SEC/1000);
+}
+
 void paintboard()
 {
     DFHack::CoreSuspender suspend;
@@ -939,12 +943,12 @@ void paintboard()
 
         if(ssConfig.config.debug_mode) {
             auto& contentLoader = stonesenseState.contentLoader;
-            draw_textf_border(font, uiColor(1), 10, 3*fontHeight, 0, "Map Read Time: %.2fms", float(stonesenseState.stoneSenseTimers.read_time));
-            draw_textf_border(font, uiColor(1), 10, 4*fontHeight, 0, "Map Beautification Time: %.2fms", float(stonesenseState.stoneSenseTimers.beautify_time));
-            draw_textf_border(font, uiColor(1), 10, 5*fontHeight, 0, "Tile Sprite Assembly Time: %.2fms", float(stonesenseState.stoneSenseTimers.assembly_time));
-            draw_textf_border(font, uiColor(1), 10, 6*fontHeight, 0, "DF Renderer Overlay Time: %.2fms", float(stonesenseState.stoneSenseTimers.overlay_time));
-            draw_textf_border(font, uiColor(1), 10, 2*fontHeight, 0, "FPS: %.2f", float(1000.0/stonesenseState.stoneSenseTimers.frame_total));
-            draw_textf_border(font, uiColor(1), 10, 7*fontHeight, 0, "Draw: %.2fms", float(stonesenseState.stoneSenseTimers.draw_time));
+            draw_textf_border(font, uiColor(1), 10, 3*fontHeight, 0, "Map Read Time: %.2fms", clockToMs(stonesenseState.stoneSenseTimers.read_time));
+            draw_textf_border(font, uiColor(1), 10, 4*fontHeight, 0, "Map Beautification Time: %.2fms", clockToMs(stonesenseState.stoneSenseTimers.beautify_time));
+            draw_textf_border(font, uiColor(1), 10, 5*fontHeight, 0, "Tile Sprite Assembly Time: %.2fms", clockToMs(stonesenseState.stoneSenseTimers.assembly_time));
+            draw_textf_border(font, uiColor(1), 10, 6*fontHeight, 0, "DF Renderer Overlay Time: %.2fms", clockToMs(stonesenseState.stoneSenseTimers.overlay_time));
+            draw_textf_border(font, uiColor(1), 10, 2*fontHeight, 0, "FPS: %.2f", 1000.0/clockToMs(stonesenseState.stoneSenseTimers.frame_total));
+            draw_textf_border(font, uiColor(1), 10, 7*fontHeight, 0, "Draw: %.2fms", clockToMs(stonesenseState.stoneSenseTimers.draw_time));
             draw_textf_border(font, uiColor(1), 10, 9*fontHeight, 0, "%i/%i/%i, %i:%i", contentLoader->currentDay+1, contentLoader->currentMonth+1, contentLoader->currentYear, contentLoader->currentHour, (contentLoader->currentTickRel*60)/50);
 
             drawDebugInfo(segment);

WorldSegment.cpp

@@ -11,8 +11,6 @@ const GameState SegmentWrap::zeroState =
     {0,0,0},0,{0,0,0},{0,0,0},{0,0,0},0,0
 };
 
-ALLEGRO_BITMAP * fog = 0;
-
 void WorldSegment::CorrectTileForSegmentOffset(int32_t& xin, int32_t& yin, int32_t& zin)
 {
     xin -= segState.Position.x;
@@ -242,24 +240,6 @@ void WorldSegment::DrawAllTiles()
     }
 
     auto& ssConfig = stonesenseState.ssConfig;
-    auto& ssState = stonesenseState.ssState;
-
-    if(ssConfig.config.fogenable) {
-        ALLEGRO_BITMAP* temp = al_get_target_bitmap();
-        if(!fog) {
-            fog = al_create_bitmap(ssState.ScreenW, ssState.ScreenH);
-            al_set_target_bitmap(fog);
-            al_clear_to_color(premultiply(ssConfig.config.fogcol));
-            al_set_target_bitmap(temp);
-        }
-        if(!((al_get_bitmap_width(fog) == ssState.ScreenW) && (al_get_bitmap_height(fog) == ssState.ScreenH))) {
-            al_destroy_bitmap(fog);
-            fog = al_create_bitmap(ssState.ScreenW, ssState.ScreenH);
-            al_set_target_bitmap(fog);
-            al_clear_to_color(premultiply(ssConfig.config.fogcol));
-            al_set_target_bitmap(temp);
-        }
-    }
 
     if (ssConfig.config.show_osd) {
         DrawCurrentLevelOutline(true);
@@ -291,7 +271,13 @@ void WorldSegment::DrawAllTiles()
             }
             switch(todraw[i].type) {
             case Fog:
-                DrawBitmap(fog, todraw[i]);
+                al_draw_filled_rectangle(
+                        todraw[i].dx,
+                        todraw[i].dy,
+                        todraw[i].dx + todraw[i].dw,
+                        todraw[i].dy + todraw[i].dh,
+                        premultiply(ssConfig.config.fogcol)
+                    );
                 break;
             case TintedScaledBitmap:
                 DrawBitmap(std::get<ALLEGRO_BITMAP*>(todraw[i].drawobject), todraw[i]);
@@ -334,7 +320,7 @@ void WorldSegment::AssembleAllTiles()
     int32_t vszmax = segState.Size.z-1; // grabbing one tile +z more than we should for tile rules
     for(int32_t vsz=0; vsz < vszmax; vsz++) {
         //add the fog to the queue
-        if(stonesenseState.ssConfig.config.fogenable && fog) {
+        if(stonesenseState.ssConfig.config.fogenable) {
             draw_event d = {
                 Fog,
                 std::monostate{},

configs/init.txt

@@ -123,7 +123,8 @@ performance gains.
 [BITMAP_HOLDS:4096]
 
 Stonesense will try to merge all loaded sprites into a single texture, for performance reasons.
-if your videocard has low memory, you may want to disable this.
+if your videocard has low memory, you may want to disable this. Enabling this feature
+will disable mipmapping to prevent sprites from going transparent when zooming out.
 [CACHE_IMAGES:NO]
 
 This sets the preferred size of the internal image cache. If your videocard does not support it,

docs/changelog.txt

@@ -47,9 +47,13 @@ Template for new versions:
 - `stonesense`: screen dimensions are now properly set when overriden by a window manager
 - `stonesense`: fixed glass cabinets and bookcases being misaligned by 1 pixel
 - `stonesense`: fixed unrevealed walls being hidden by default
+- `stonesense`: vampires no longer show their true name when they shouldn't
+- `stonesense`: fixed debug performance timers to show milliseconds as intended
+- `stonesense`: ``CACHE_IMAGES`` now disables mipmapping, stopping sprites from going transparent
 
 ## Misc Improvements
 - `stonesense`: improved the way altars look
+- `stonesense`: fog no longer unnecessarily renders to a separate bitmap
 
 ## Removed
 

main.cpp

@@ -399,7 +399,12 @@ static void* stonesense_thread(ALLEGRO_THREAD* main_thread, void* parms)
     if(ssConfig.config.software) {
         al_set_new_bitmap_flags(ALLEGRO_MEMORY_BITMAP|_ALLEGRO_ALPHA_TEST|ALLEGRO_MIN_LINEAR|ALLEGRO_MIPMAP);
     } else {
-        al_set_new_bitmap_flags(ALLEGRO_MIN_LINEAR|ALLEGRO_MIPMAP);
+        // FIXME: When we have ability to set a maximum mipmap lod,
+        // do so when cache_images is enabled to prevent sprites going transparent.
+        // Until then, disable mipmapping when using an image cache.
+        al_set_new_bitmap_flags(
+                ALLEGRO_MIN_LINEAR
+                |(ssConfig.config.cache_images ? 0 : ALLEGRO_MIPMAP));
     }
 
     display = al_create_display(stonesenseState.ssState.ScreenW, stonesenseState.ssState.ScreenH);