diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-01-31 16:58:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-31 23:58:59 +0200 |
| commit | ca3e9008357a096ed184343566c99b248520f827 (patch) | |
| tree | 62d2c79263d3ab37ed6a87b75903f3c7025845b1 /src/d/d_error_msg.cpp | |
| parent | 6b0e392c130e289a975c5c18eb37c0376fd2cf75 (diff) | |
Fix false pointer relocations in data breaking shiftability (#2296)
* Fix false pointer relocations in data breaking shiftability
* Update matDL_dis.py from tww
* remove debug prints from matDL build script
* matDL build rule: Allow specifying global/local scope
* Use asset extraction for ShieldD
* Set mode `+x` on executable Python scripts
* set `+x` on matDL_dis
Diffstat (limited to 'src/d/d_error_msg.cpp')
| -rw-r--r-- | src/d/d_error_msg.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp index 06c13abf61..0c68a1f818 100644 --- a/src/d/d_error_msg.cpp +++ b/src/d/d_error_msg.cpp @@ -35,7 +35,7 @@ static void messageSet(u32 status, bool i_drawBg) { BMG_INF1* inf1 = (BMG_INF1*)&msg_data[0x20]; const char* msg_p = (const char*)((u8*)inf1->getNext() + sizeof(JUTDataBlockHeader) + inf1->entries[status]); - JUT_ASSERT(std::strlen(msg_p)-1 < 512); + JUT_ASSERT(102, std::strlen(msg_p)-1 < 512); J2DTextBox tpane('TEXT1', JGeometry::TBox2<f32>(0.0f, 0.0f, 608.0f, 200.0f), (ResFONT*)font_data, msg_p, 512, HBIND_CENTER, VBIND_CENTER); J2DTextBox spane('TEXT2', JGeometry::TBox2<f32>(0.0f, 0.0f, 608.0f, 200.0f), (ResFONT*)font_data, msg_p, 512, HBIND_CENTER, VBIND_CENTER); @@ -85,7 +85,7 @@ static void messageSet(u32 status, bool i_drawBg) { if (*msg_p == '\n') { height += 23.0f; cnt++; - JUT_ASSERT(cnt < lineMax); + JUT_ASSERT(191, cnt < lineMax); continue; } |