From edbf1c86db94991af299df17a226702f3e0860c4 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Sun, 25 Aug 2024 22:14:49 +0200 Subject: Rewrite Ui.txt as regular C string array --- src/c_ui.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/c_ui.c') diff --git a/src/c_ui.c b/src/c_ui.c index 33939f8..f53c4c9 100644 --- a/src/c_ui.c +++ b/src/c_ui.c @@ -163,7 +163,7 @@ enum STATUS_NO // Index in status icon collection file // ****** FREE TEXT GRAPHIC RESOURCES **************************************** -#include "Ui.txt" // Text strings that is'nt defined in menu files +#include "Ui_txt.h" // Text strings that isn't defined in menu files enum // String index in text string file { @@ -368,17 +368,12 @@ UBYTE* cUiGetMenuPointer(UBYTE FileNo) UBYTE* cUiGetString(UBYTE No) // Get string in text string file { UBYTE *Result = NULL; - TXT *pUi; - UWORD Tmp; - pUi = (TXT*)&Ui; if (No) { - if (No <= pUi->ItemsY) + if (No <= sizeof(Ui) / sizeof(Ui[0])) { - Tmp = No - 1; - Tmp *= pUi->ItemCharsX; - Result = &(pUi->Data[Tmp]); + Result = (UBYTE *) Ui[No - 1]; } } -- cgit v1.2.3