From 08e69b1d2e7d008d4697cce2ec0008822ce15b58 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 24 Jan 2020 19:50:44 +0100 Subject: [PATCH] - fixed missing messages in Shadow Warrior. --- source/sw/src/rotator.cpp | 2 +- source/sw/src/slidor.cpp | 2 +- source/sw/src/sprite.cpp | 4 +++- source/sw/src/vator.cpp | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/source/sw/src/rotator.cpp b/source/sw/src/rotator.cpp index dcf0d2a3c..765f57894 100644 --- a/source/sw/src/rotator.cpp +++ b/source/sw/src/rotator.cpp @@ -218,7 +218,7 @@ DoRotatorMatch(PLAYERp pp, short match, SWBOOL manual) else #endif { - PutStringInfo(pp, quoteMgr.GetExQuote(QUOTE_DOORMSG + key_num - 1)); + PutStringInfo(pp, quoteMgr.GetQuote(QUOTE_DOORMSG + key_num - 1)); return -1; } } diff --git a/source/sw/src/slidor.cpp b/source/sw/src/slidor.cpp index a1161d6d7..e3d916091 100644 --- a/source/sw/src/slidor.cpp +++ b/source/sw/src/slidor.cpp @@ -214,7 +214,7 @@ DoSlidorMatch(PLAYERp pp, short match, SWBOOL manual) else #endif { - PutStringInfo(pp, quoteMgr.GetExQuote(QUOTE_DOORMSG + key_num - 1)); + PutStringInfo(pp, quoteMgr.GetQuote(QUOTE_DOORMSG + key_num - 1)); return -1; } } diff --git a/source/sw/src/sprite.cpp b/source/sw/src/sprite.cpp index efab6de31..9b8d27f40 100644 --- a/source/sw/src/sprite.cpp +++ b/source/sw/src/sprite.cpp @@ -5763,7 +5763,9 @@ KeyMain: { int cookie = (adult_lockout || Global_PLock)? STD_RANDOM_RANGE(10) : STD_RANDOM_RANGE(MAX_FORTUNES); // print to the console, and if active to the generic notify display. - Printf(PRINT_NOTIFY, TEXTCOLOR_SAPPHIRE "%s: %s\n", GStrings("TXTS_FORTUNE"), quoteMgr.GetQuote(QUOTE_COOKIE + cookie)); + FStringf msg(TEXTCOLOR_SAPPHIRE "%s: %s", GStrings("TXTS_FORTUNE"), quoteMgr.GetQuote(QUOTE_COOKIE + cookie)); + Printf("%s\n", msg.GetChars()); + adduserquote(msg.GetChars()); } SetFadeAmt(pp,ITEMFLASHAMT,ITEMFLASHCLR); // Flash blue on item pickup diff --git a/source/sw/src/vator.cpp b/source/sw/src/vator.cpp index 3a580ab85..1753118c7 100644 --- a/source/sw/src/vator.cpp +++ b/source/sw/src/vator.cpp @@ -200,7 +200,7 @@ short DoVatorOperate(PLAYERp pp, short sectnum) else #endif { - PutStringInfo(pp, quoteMgr.GetExQuote(QUOTE_DOORMSG + key_num - 1)); + PutStringInfo(pp, quoteMgr.GetQuote(QUOTE_DOORMSG + key_num - 1)); return FALSE; } } @@ -268,7 +268,7 @@ DoVatorMatch(PLAYERp pp, short match) else #endif { - PutStringInfo(pp, quoteMgr.GetExQuote(QUOTE_DOORMSG + key_num - 1)); + PutStringInfo(pp, quoteMgr.GetQuote(QUOTE_DOORMSG + key_num - 1)); return -1; } }