Merge pull request #77289 from katemonster33/imgui_freetype_msvc_buil…

…d_broken Added imgui_freetype.cpp to MSVC project file to fix broken build.
CleverRaven · Oct 24, 2024 · 2d90bfe · 2d90bfe
2 parents 8d2de7b + c7cc651
commit 2d90bfe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/msvc-full-features/ImGui-lib-vcpkg-static.vcxproj b/msvc-full-features/ImGui-lib-vcpkg-static.vcxproj
@@ -67,6 +67,7 @@
     <ClCompile Include="..\src\third-party\imgui\imgui.cpp" />
     <ClCompile Include="..\src\third-party\imgui\imgui_demo.cpp" />
     <ClCompile Include="..\src\third-party\imgui\imgui_draw.cpp" />
+    <ClCompile Include="..\src\third-party\imgui\imgui_freetype.cpp" />
     <ClCompile Include="..\src\third-party\imgui\imgui_impl_sdl2.cpp" />
     <ClCompile Include="..\src\third-party\imgui\imgui_impl_sdlrenderer2.cpp" />
     <ClCompile Include="..\src\third-party\imgui\imgui_tables.cpp" />

diff --git a/src/bionics.cpp b/src/bionics.cpp
@@ -928,7 +928,7 @@ bool Character::activate_bionic( bionic &bio, bool eff_only, bool *close_bionics
         add_msg_if_player( m_info, _( "You can now run faster, assisted by joint servomotors." ) );
     } else if( bio.id == bio_lighter ) {
         const std::optional<tripoint> pnt = choose_adjacent( _( "Start a fire where?" ) );
-        if( pnt && here.is_flammable( *pnt ) && !here.get_field( *pnt, fd_fire ) ) {
+        if( pnt && here.is_flammable( *pnt ) && !here.get_field( tripoint_bub_ms( *pnt ), fd_fire ) ) {
             add_msg_activate();
             here.add_field( *pnt, fd_fire, 1 );
             if( has_trait( trait_PYROMANIA ) ) {