drummyfish/Licar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean a bit

Browse source
This commit is contained in:
Miloslav Ciz 2025-01-08 21:28:01 +01:00
parent ac95a4f0b6
commit 614741f6e8
6 changed files with 36 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

22
game.h
View file

@ -180,14 +180,6 @@ uint8_t LCR_gameGetNextAudioSample(void);
#define LCR_GAME_STATE_LOADING_MAP 0x04
#define LCR_GAME_STATE_END 0xff
// TODO: move to consts?
#define LCR_MENU_MAX_ITEMS 9 // don't change
#define LCR_RESOURCE_ITEM_CHUNK (LCR_MENU_MAX_ITEMS - 1)
#define LCR_MENU_TABS 4
#define LCR_MENU_STRING_SIZE 16
struct
{
uint8_t state;
@ -214,8 +206,6 @@ struct
const char *itemNamePtrs[LCR_MENU_MAX_ITEMS]; ///< helper array
} menu;
// TODO: make menu struct?
struct
{
int state; ///< -1 if reading external res. f., else pos.
@ -422,7 +412,7 @@ void LCR_gameLoadMainMenuItems(void)
char replaceChar = i == 0 ? '0' + LCR_game.cameraMode :
(i == 1 ? '0' + LCR_game.musicOn : ('0' + LCR_audio.on));
LCR_gameSetMenuItemStr(i,LCR_texts[4 + i],replaceChar);
LCR_gameSetMenuItemStr(i,LCR_texts[LCR_TEXTS_MAIN_MENU + i],replaceChar);
}
LCR_game.menu.itemCount = 4;
@ -907,9 +897,9 @@ uint8_t LCR_gameStep(uint32_t time)
if (LCR_game.state == LCR_GAME_STATE_MENU ||
LCR_game.state == LCR_GAME_STATE_LOADING_MAP)
LCR_rendererDrawMenu(LCR_texts[LCR_game.menu.selectedTab],
LCR_game.menu.itemNamePtrs,LCR_game.menu.itemCount + 1,
LCR_game.menu.selectedItem);
LCR_rendererDrawMenu(LCR_texts[LCR_TEXTS_TABS
+ LCR_game.menu.selectedTab],LCR_game.menu.itemNamePtrs,
LCR_game.menu.itemCount + 1,LCR_game.menu.selectedItem);
else
LCR_gameDraw3DView();
}
@ -930,9 +920,9 @@ uint8_t LCR_gameStep(uint32_t time)
LCR_EFFECTIVE_RESOLUTION_Y - 2 * LCR_EFFECTIVE_RESOLUTION_Y / 3,
0xffff,0);
LCR_rendererDrawText(LCR_texts[9],
LCR_rendererDrawText(LCR_texts[LCR_TEXTS_LOADING],
(LCR_EFFECTIVE_RESOLUTION_X -
LCR_rendererComputeTextWidth(LCR_texts[9],4)) / 2,
LCR_rendererComputeTextWidth(LCR_texts[LCR_TEXTS_LOADING],4)) / 2,
(LCR_EFFECTIVE_RESOLUTION_Y -
LCR_rendererComputeTextHeight(4)) / 2,0x0000,4);
}