[Scummvm-git-logs] scummvm master -> 4f4c372a56628f916ba557c21dbc31c907d8f647

lotharsm noreply at scummvm.org
Sun Feb 5 10:50:35 UTC 2023


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4f4c372a56 MM: MM1: Fix compliation error due to missing c_str() call


Commit: 4f4c372a56628f916ba557c21dbc31c907d8f647
    https://github.com/scummvm/scummvm/commit/4f4c372a56628f916ba557c21dbc31c907d8f647
Author: Lothar Serra Mari (mail at serra.me)
Date: 2023-02-05T11:50:20+01:00

Commit Message:
MM: MM1: Fix compliation error due to missing c_str() call

Changed paths:
    engines/mm/mm1/game/combat.cpp


diff --git a/engines/mm/mm1/game/combat.cpp b/engines/mm/mm1/game/combat.cpp
index 130b8e68e35..9a6859088a4 100644
--- a/engines/mm/mm1/game/combat.cpp
+++ b/engines/mm/mm1/game/combat.cpp
@@ -1636,7 +1636,7 @@ Common::String Combat::subtractDamageFromChar() {
 			c._condition |= UNCONSCIOUS;
 
 			result = Common::String::format("%s %s", c._name,
-				STRING["monster_spellsState.goes_down"]);
+				STRING["monster_spellsState.goes_down"].c_str());
 			Sound::sound2(SOUND_8);
 
 		} else {
@@ -1644,7 +1644,7 @@ Common::String Combat::subtractDamageFromChar() {
 				c._condition = BAD_CONDITION | DEAD;
 
 			result = Common::String::format("%s %s", c._name,
-				STRING["monster_spellsState.dies"]);
+				STRING["monster_spellsState.dies"].c_str());
 			Sound::sound2(SOUND_8);
 		}
 	}




More information about the Scummvm-git-logs mailing list