mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-28 06:53:40 +00:00
Merge branch 'master' into new_level_refactor
# Conflicts: # src/p_user.cpp
This commit is contained in:
commit
1dbbb56a1b
10 changed files with 14 additions and 8 deletions
|
@ -490,7 +490,7 @@ void G_InitNew (const char *mapname, bool bTitleLevel)
|
|||
for (i = 0; i < MAXPLAYERS; ++i)
|
||||
{
|
||||
if (playeringame[i])
|
||||
players[i].SetLogText ("Find help");
|
||||
players[i].SetLogText ("$TXT_FINDHELP");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -923,7 +923,7 @@ class CommandDrawString : public SBarInfoCommand
|
|||
break;
|
||||
}
|
||||
case LOGTEXT:
|
||||
str = statusBar->CPlayer->LogText;
|
||||
str = GStrings(statusBar->CPlayer->LogText);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
|
@ -55,6 +55,7 @@
|
|||
#include "vm.h"
|
||||
#include "p_acs.h"
|
||||
#include "sbarinfo.h"
|
||||
#include "gstrings.h"
|
||||
#include "events.h"
|
||||
#include "g_game.h"
|
||||
|
||||
|
@ -1046,7 +1047,7 @@ void DBaseStatusBar::DrawLog ()
|
|||
hudheight = SCREENHEIGHT / scale;
|
||||
|
||||
int linelen = hudwidth<640? Scale(hudwidth,9,10)-40 : 560;
|
||||
auto lines = V_BreakLines (SmallFont, linelen, CPlayer->LogText);
|
||||
auto lines = V_BreakLines (SmallFont, linelen, GStrings(CPlayer->LogText));
|
||||
int height = 20;
|
||||
|
||||
for (unsigned i = 0; i < lines.Size(); i++) height += SmallFont->GetHeight () + 1;
|
||||
|
|
|
@ -555,7 +555,7 @@ int P_GetMapColorForKey (AActor * key)
|
|||
foundlock = pair->Key;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
return rgb;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -91,6 +91,7 @@
|
|||
#include "events.h"
|
||||
#include "g_game.h"
|
||||
#include "v_video.h"
|
||||
#include "gstrings.h"
|
||||
|
||||
static FRandom pr_skullpop ("SkullPop");
|
||||
|
||||
|
@ -403,7 +404,7 @@ void player_t::SetLogText (const char *text)
|
|||
{
|
||||
// Print log text to console
|
||||
AddToConsole(-1, TEXTCOLOR_GOLD);
|
||||
AddToConsole(-1, LogText);
|
||||
AddToConsole(-1, GStrings(LogText));
|
||||
AddToConsole(-1, "\n");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1464,6 +1464,8 @@ TXT_DOES_NOT_WORK = "That doesn't seem to work";
|
|||
|
||||
// Strife Quest messages
|
||||
|
||||
TXT_FINDHELP = "FIND HELP";
|
||||
|
||||
TXT_QUEST_14 = "You've Blown Up the Crystal";
|
||||
TXT_QUEST_16 = "You've Blown Up the Gates";
|
||||
TXT_QUEST_27 = "You've Blown Up the Computer";
|
||||
|
|
|
@ -336,7 +336,7 @@ extend class Actor
|
|||
while (last.inv != NULL)
|
||||
{
|
||||
let inv = last.inv;
|
||||
if (!inv.bUndroppable)
|
||||
if (!inv.bUndroppable && !inv.bUnclearable)
|
||||
{
|
||||
inv.DepleteOrDestroy();
|
||||
if (!inv.bDestroyed) last = inv; // was only depleted so advance the pointer manually.
|
||||
|
|
|
@ -64,6 +64,7 @@ class Inventory : Actor
|
|||
flagdef IsArmor: ItemFlags, 21;
|
||||
flagdef IsHealth: ItemFlags, 22;
|
||||
flagdef AlwaysPickup: ItemFlags, 23;
|
||||
flagdef Unclearable: ItemFlags, 24;
|
||||
|
||||
flagdef ForceRespawnInSurvival: none, 0;
|
||||
flagdef PickupFlash: none, 6;
|
||||
|
|
|
@ -2028,7 +2028,7 @@ class PlayerPawn : Actor
|
|||
if (item.bINVBAR && item.Amount > item.InterHubAmount)
|
||||
{
|
||||
item.Amount = item.InterHubAmount;
|
||||
if (level.REMOVEITEMS && !item.bUNDROPPABLE)
|
||||
if (level.REMOVEITEMS && !item.bUNDROPPABLE && !item.bUNCLEARABLE)
|
||||
{
|
||||
todelete.Push(item);
|
||||
}
|
||||
|
|
|
@ -432,7 +432,8 @@ class StrifeStatusBar : BaseStatusBar
|
|||
|
||||
if (CPlayer.LogText.Length() > 0)
|
||||
{
|
||||
BrokenLines lines = SmallFont2.BreakLines(CPlayer.LogText, 272);
|
||||
let text = Stringtable.Localize(CPlayer.LogText);
|
||||
BrokenLines lines = SmallFont2.BreakLines(text, 272);
|
||||
for (i = 0; i < lines.Count(); ++i)
|
||||
{
|
||||
screen.DrawText(SmallFont2, Font.CR_UNTRANSLATED, left + 24 * xscale, top + (18 + i * 12)*yscale,
|
||||
|
|
Loading…
Reference in a new issue