MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable multiline DiabloMsg and use it in debug.cpp

Browse source
This commit is contained in:
obligaron 2021-08-23 08:35:18 +02:00 • committed by Anders Jenbo
commit a27ab517dc
3 changed files with 64 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Source/debug.cpp
View file

@ -13,6 +13,7 @@
#include "cursor.h"
#include "engine/load_cel.hpp"
#include "engine/point.hpp"
#include "error.h"
#include "inv.h"
#include "lighting.h"
#include "setmaps.h"
@ -80,19 +81,12 @@ std::string DebugCmdHelp(const std::string_view parameter)
{
if (parameter.empty()) {
std::string ret = "Available Debug Commands: ";
int lenCurrentLine = ret.length();
bool first = true;
for (const auto &dbgCmd : DebugCmdList) {
if ((dbgCmd.text.length() + lenCurrentLine + 3) > MAX_SEND_STR_LEN) {
ret.append("\n");
lenCurrentLine = dbgCmd.text.length();
} else {
if (first)
first = false;
else
ret.append(" - ");
lenCurrentLine += (dbgCmd.text.length() + 3);
}
if (first)
first = false;
else
ret.append(" - ");
ret.append(dbgCmd.text);
}
return ret;
@ -509,19 +503,7 @@ bool CheckDebugTextCommand(const std::string_view text)
if (text.length() > (dbgCmd.text.length() + 1))
parameter = text.substr(dbgCmd.text.length() + 1);
const auto result = dbgCmd.actionProc(parameter);
const std::string delim = "\n";
auto start = 0U;
auto end = result.find(delim);
while (end != std::string::npos) {
const auto line = result.substr(start, end - start);
NetSendCmdString(1 << MyPlayerId, line.c_str());
start = end + delim.length();
end = result.find(delim, start);
}
if (start != result.length())
NetSendCmdString(1 << MyPlayerId, result.substr(start).c_str());
InitDiabloMsg(result);
return true;
}

75
Source/error.cpp
View file

@ -19,7 +19,36 @@ namespace devilution {
namespace {
std::deque<std::string> DiabloMessages;
std::vector<std::string> TextLines;
uint32_t msgdelay;
int ErrorWindowHeight = 54;
const int LineHeight = 12;
const int LineWidth = 418;
void InitNextLines()
{
msgdelay = SDL_GetTicks();
auto message = DiabloMessages.front();
TextLines.clear();
char tempstr[1536]; // Longest test is about 768 chars * 2 for unicode
strcpy(tempstr, message.data());
WordWrapGameString(tempstr, LineWidth, GameFontSmall, 1);
const string_view paragraphs = tempstr;
size_t previous = 0;
while (true) {
size_t next = paragraphs.find('\n', previous);
TextLines.emplace_back(paragraphs.substr(previous, next));
if (next == std::string::npos)
break;
previous = next + 1;
}
ErrorWindowHeight = std::max(54, static_cast<int>((TextLines.size() * LineHeight) + 42));
}
} // namespace
@ -85,7 +114,11 @@ const char *const MsgStrings[] = {
void InitDiabloMsg(diablo_message e)
{
std::string msg = _(MsgStrings[e]);
InitDiabloMsg(msg);
}
void InitDiabloMsg(std::string msg)
{
if (DiabloMessages.size() >= MAX_SEND_STR_LEN)
return;
@ -93,7 +126,8 @@ void InitDiabloMsg(diablo_message e)
return;
DiabloMessages.push_back(msg);
msgdelay = SDL_GetTicks();
if (DiabloMessages.size() == 1)
InitNextLines();
}
bool IsDiabloMsgAvailable()
@ -111,41 +145,44 @@ void ClrDiabloMsg()
DiabloMessages.clear();
}
#define DIALOG_Y ((gnScreenHeight - PANEL_HEIGHT) / 2 - 18)
void DrawDiabloMsg(const Surface &out)
{
CelDrawTo(out, { PANEL_X + 101, DIALOG_Y }, *pSTextSlidCels, 1);
CelDrawTo(out, { PANEL_X + 527, DIALOG_Y }, *pSTextSlidCels, 4);
CelDrawTo(out, { PANEL_X + 101, DIALOG_Y + 48 }, *pSTextSlidCels, 2);
CelDrawTo(out, { PANEL_X + 527, DIALOG_Y + 48 }, *pSTextSlidCels, 3);
int dialogStartY = ((gnScreenHeight - PANEL_HEIGHT) / 2) - (ErrorWindowHeight / 2) + 9;
CelDrawTo(out, { PANEL_X + 101, dialogStartY }, *pSTextSlidCels, 1);
CelDrawTo(out, { PANEL_X + 527, dialogStartY }, *pSTextSlidCels, 4);
CelDrawTo(out, { PANEL_X + 101, dialogStartY + ErrorWindowHeight - 6 }, *pSTextSlidCels, 2);
CelDrawTo(out, { PANEL_X + 527, dialogStartY + ErrorWindowHeight - 6 }, *pSTextSlidCels, 3);
int sx = PANEL_X + 109;
for (int i = 0; i < 35; i++) {
CelDrawTo(out, { sx, DIALOG_Y }, *pSTextSlidCels, 5);
CelDrawTo(out, { sx, DIALOG_Y + 48 }, *pSTextSlidCels, 7);
CelDrawTo(out, { sx, dialogStartY }, *pSTextSlidCels, 5);
CelDrawTo(out, { sx, dialogStartY + ErrorWindowHeight - 6 }, *pSTextSlidCels, 7);
sx += 12;
}
int sy = DIALOG_Y + 12;
for (int i = 0; i < 3; i++) {
CelDrawTo(out, { PANEL_X + 101, sy }, *pSTextSlidCels, 6);
CelDrawTo(out, { PANEL_X + 527, sy }, *pSTextSlidCels, 8);
sy += 12;
int drawnYborder = 12;
while ((drawnYborder + 12) < ErrorWindowHeight) {
CelDrawTo(out, { PANEL_X + 101, dialogStartY + drawnYborder }, *pSTextSlidCels, 6);
CelDrawTo(out, { PANEL_X + 527, dialogStartY + drawnYborder }, *pSTextSlidCels, 8);
drawnYborder += 12;
}
DrawHalfTransparentRectTo(out, PANEL_X + 104, DIALOG_Y - 8, 432, 54);
DrawHalfTransparentRectTo(out, PANEL_X + 104, dialogStartY - 8, 432, ErrorWindowHeight);
auto message = DiabloMessages.front();
DrawString(out, message, { { PANEL_X + 101, DIALOG_Y + 24 }, { 442, 0 } }, UiFlags::AlignCenter);
int lineNumber = 0;
for (auto &line : TextLines) {
DrawString(out, line.c_str(), { { PANEL_X + 109, dialogStartY + 24 + lineNumber * LineHeight }, { LineWidth, LineHeight } }, UiFlags::AlignCenter, 1, LineHeight);
lineNumber += 1;
}
if (msgdelay > 0 && msgdelay <= SDL_GetTicks() - 3500) {
msgdelay = 0;
}
if (msgdelay == 0) {
DiabloMessages.pop_front();
if (!DiabloMessages.empty()) {
msgdelay = SDL_GetTicks();
}
if (!DiabloMessages.empty())
InitNextLines();
}
}

2
Source/error.h
View file

@ -6,6 +6,7 @@
#pragma once
#include <cstdint>
#include <string>
#include "engine.h"
@ -70,6 +71,7 @@ enum diablo_message : uint8_t {
};
void InitDiabloMsg(diablo_message e);
void InitDiabloMsg(std::string msg);
bool IsDiabloMsgAvailable();
void CancelCurrentDiabloMsg();
void ClrDiabloMsg();