Clean a little
This commit is contained in:
parent
302bac10e6
commit
402867e73b
3 changed files with 64 additions and 62 deletions
101
game.h
101
game.h
|
|
@ -202,18 +202,19 @@ struct
|
|||
uint8_t keyStates[LCR_KEYS_TOTAL]; /**< Assures unchanging key states
|
||||
during a single frame, hold number of
|
||||
frames for which the key has been
|
||||
continuously held. */
|
||||
|
||||
uint32_t runTimeMS;
|
||||
continuously held. */
|
||||
uint32_t runTimeMS; /**< Current time of the run */
|
||||
|
||||
struct
|
||||
{
|
||||
uint8_t selectedTab;
|
||||
uint8_t selectedItem;
|
||||
uint8_t itemCount;
|
||||
char itemNames[LCR_MENU_MAX_ITEMS][LCR_MENU_STRING_SIZE];
|
||||
const char *itemNamePtrs[LCR_MENU_MAX_ITEMS]; ///< helper array
|
||||
} menu;
|
||||
|
||||
// TODO: make menu struct?
|
||||
uint8_t menuSelectedTab;
|
||||
uint8_t menuSelectedItem;
|
||||
|
||||
char menuItemNames[LCR_MENU_MAX_ITEMS][LCR_MENU_STRING_SIZE];
|
||||
uint8_t menuItemCount;
|
||||
const char *menuItemNamePointers[LCR_MENU_MAX_ITEMS]; ///< helper array
|
||||
|
||||
struct
|
||||
{
|
||||
|
|
@ -398,21 +399,19 @@ void LCR_gameStartRun(unsigned int mapIndex)
|
|||
|
||||
void LCR_gameEraseMenuItemNames(void)
|
||||
{
|
||||
for (int i = 0; i < LCR_MENU_MAX_ITEMS; ++i)
|
||||
for (int j = 0; j < LCR_MENU_STRING_SIZE; ++j)
|
||||
LCR_game.menu.itemNames[i][j] = 0;
|
||||
|
||||
for (int i = 0; i < LCR_MENU_MAX_ITEMS; ++i)
|
||||
for (int j = 0; j < LCR_MENU_STRING_SIZE; ++j)
|
||||
LCR_game.menuItemNames[i][j] = 0;
|
||||
|
||||
LCR_game.menuItemCount = 0;
|
||||
|
||||
LCR_game.menu.itemCount = 0;
|
||||
}
|
||||
|
||||
void LCR_gameSetMenuItemStr(uint8_t item, const char *str, char replaceChar)
|
||||
{
|
||||
for (int i = 0; i < LCR_MENU_STRING_SIZE - 1; ++i)
|
||||
{
|
||||
LCR_game.menuItemNames[item][i] = str[i] == '$' ? replaceChar : str[i];
|
||||
LCR_game.menuItemNames[item][i + 1] = 0;
|
||||
LCR_game.menu.itemNames[item][i] = str[i] == '$' ? replaceChar : str[i];
|
||||
LCR_game.menu.itemNames[item][i + 1] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -426,7 +425,7 @@ void LCR_gameLoadMainMenuItems(void)
|
|||
LCR_gameSetMenuItemStr(i,LCR_texts[4 + i],replaceChar);
|
||||
}
|
||||
|
||||
LCR_game.menuItemCount = 4;
|
||||
LCR_game.menu.itemCount = 4;
|
||||
}
|
||||
|
||||
void LCR_gameInit(void)
|
||||
|
|
@ -444,10 +443,10 @@ void LCR_gameInit(void)
|
|||
LCR_game.resourceFile.state = 0;
|
||||
|
||||
for (int i = 0; i < LCR_MENU_MAX_ITEMS; ++i)
|
||||
LCR_game.menuItemNamePointers[i] = LCR_game.menuItemNames[i];
|
||||
LCR_game.menu.itemNamePtrs[i] = LCR_game.menu.itemNames[i];
|
||||
|
||||
LCR_game.menuSelectedTab = 0;
|
||||
LCR_game.menuSelectedItem = 0;
|
||||
LCR_game.menu.selectedTab = 0;
|
||||
LCR_game.menu.selectedItem = 0;
|
||||
|
||||
LCR_game.frame = 0;
|
||||
LCR_game.musicOn = 1;
|
||||
|
|
@ -516,13 +515,13 @@ void LCR_gameLoadResourceFileChunk(unsigned int startIndex, char magicNumber)
|
|||
state >= 1 + LCR_MENU_STRING_SIZE - 1)
|
||||
{
|
||||
state = 255;
|
||||
LCR_game.menuItemCount++;
|
||||
LCR_game.menu.itemCount++;
|
||||
|
||||
if (LCR_game.menuItemCount >= LCR_RESOURCE_ITEM_CHUNK)
|
||||
if (LCR_game.menu.itemCount >= LCR_RESOURCE_ITEM_CHUNK)
|
||||
break;
|
||||
}
|
||||
else
|
||||
LCR_game.menuItemNames[LCR_game.menuItemCount][state - 1] = c;
|
||||
LCR_game.menu.itemNames[LCR_game.menu.itemCount][state - 1] = c;
|
||||
|
||||
state++;
|
||||
}
|
||||
|
|
@ -562,7 +561,7 @@ void LCR_gameDraw3DView(void)
|
|||
LCR_racingGetWheelSteer() * 2);
|
||||
#endif
|
||||
|
||||
LCR_rendererDraw();
|
||||
LCR_rendererDraw3D();
|
||||
|
||||
#if LCR_SETTING_DEBUG_PHYSICS_DRAW
|
||||
LCR_GameUnit camTr[7];
|
||||
|
|
@ -644,34 +643,34 @@ void LCR_gameHandleInput(void)
|
|||
if (LCR_game.keyStates[LCR_KEY_RIGHT] == 1)
|
||||
{
|
||||
LCR_LOG1("menu tab right");
|
||||
LCR_game.menuSelectedTab =
|
||||
(LCR_game.menuSelectedTab + 1) % LCR_MENU_TABS;
|
||||
tabSwitchedTo = LCR_game.menuSelectedTab;
|
||||
LCR_game.menuSelectedItem = 0;
|
||||
LCR_game.menu.selectedTab =
|
||||
(LCR_game.menu.selectedTab + 1) % LCR_MENU_TABS;
|
||||
tabSwitchedTo = LCR_game.menu.selectedTab;
|
||||
LCR_game.menu.selectedItem = 0;
|
||||
LCR_audioPlaySound(LCR_SOUND_CLICK);
|
||||
}
|
||||
else if (LCR_game.keyStates[LCR_KEY_LEFT] == 1)
|
||||
{
|
||||
LCR_LOG1("menu tab left");
|
||||
LCR_game.menuSelectedTab =
|
||||
(LCR_game.menuSelectedTab + LCR_MENU_TABS - 1) % LCR_MENU_TABS;
|
||||
tabSwitchedTo = LCR_game.menuSelectedTab;
|
||||
LCR_game.menuSelectedItem = 0;
|
||||
LCR_game.menu.selectedTab =
|
||||
(LCR_game.menu.selectedTab + LCR_MENU_TABS - 1) % LCR_MENU_TABS;
|
||||
tabSwitchedTo = LCR_game.menu.selectedTab;
|
||||
LCR_game.menu.selectedItem = 0;
|
||||
LCR_audioPlaySound(LCR_SOUND_CLICK);
|
||||
}
|
||||
else if (LCR_game.keyStates[LCR_KEY_UP] == 1)
|
||||
{
|
||||
LCR_LOG1("menu item up");
|
||||
|
||||
if (LCR_game.menuSelectedItem != 0)
|
||||
if (LCR_game.menu.selectedItem != 0)
|
||||
{
|
||||
LCR_game.menuSelectedItem--;
|
||||
LCR_game.menu.selectedItem--;
|
||||
LCR_audioPlaySound(LCR_SOUND_CLICK);
|
||||
}
|
||||
else if (LCR_game.menuSelectedTab != 0 &&
|
||||
else if (LCR_game.menu.selectedTab != 0 &&
|
||||
LCR_game.resourceFile.firstItemIndex != 0)
|
||||
{
|
||||
LCR_game.menuSelectedItem = LCR_RESOURCE_ITEM_CHUNK - 1;
|
||||
LCR_game.menu.selectedItem = LCR_RESOURCE_ITEM_CHUNK - 1;
|
||||
LCR_audioPlaySound(LCR_SOUND_CLICK);
|
||||
scrolled = -1;
|
||||
}
|
||||
|
|
@ -680,23 +679,23 @@ void LCR_gameHandleInput(void)
|
|||
{
|
||||
LCR_LOG1("menu item down");
|
||||
|
||||
if (LCR_game.menuSelectedTab == 0)
|
||||
if (LCR_game.menu.selectedTab == 0)
|
||||
{
|
||||
if (LCR_game.menuSelectedItem < 4)
|
||||
if (LCR_game.menu.selectedItem < 4)
|
||||
{
|
||||
LCR_game.menuSelectedItem++;
|
||||
LCR_game.menu.selectedItem++;
|
||||
LCR_audioPlaySound(LCR_SOUND_CLICK);
|
||||
}
|
||||
}
|
||||
else if (LCR_game.menuSelectedItem < LCR_game.menuItemCount - 1)
|
||||
else if (LCR_game.menu.selectedItem < LCR_game.menu.itemCount - 1)
|
||||
{
|
||||
LCR_game.menuSelectedItem++;
|
||||
LCR_game.menu.selectedItem++;
|
||||
LCR_audioPlaySound(LCR_SOUND_CLICK);
|
||||
}
|
||||
else if (LCR_game.resourceFile.firstItemIndex +
|
||||
LCR_RESOURCE_ITEM_CHUNK < LCR_game.resourceFile.itemsTotal)
|
||||
{
|
||||
LCR_game.menuSelectedItem = 0;
|
||||
LCR_game.menu.selectedItem = 0;
|
||||
LCR_audioPlaySound(LCR_SOUND_CLICK);
|
||||
scrolled = 1;
|
||||
}
|
||||
|
|
@ -711,10 +710,10 @@ void LCR_gameHandleInput(void)
|
|||
LCR_LOG1("menu confirm");
|
||||
LCR_audioPlaySound(LCR_SOUND_CLICK);
|
||||
|
||||
switch (LCR_game.menuSelectedTab)
|
||||
switch (LCR_game.menu.selectedTab)
|
||||
{
|
||||
case 0:
|
||||
switch (LCR_game.menuSelectedItem)
|
||||
switch (LCR_game.menu.selectedItem)
|
||||
{
|
||||
case 0:
|
||||
LCR_game.cameraMode = (LCR_game.cameraMode + 1) % 4;
|
||||
|
|
@ -743,7 +742,7 @@ void LCR_gameHandleInput(void)
|
|||
|
||||
case 1:
|
||||
LCR_gameStartRun(
|
||||
LCR_game.resourceFile.firstItemIndex + LCR_game.menuSelectedItem);
|
||||
LCR_game.resourceFile.firstItemIndex + LCR_game.menu.selectedItem);
|
||||
break;
|
||||
|
||||
default: break;
|
||||
|
|
@ -769,7 +768,7 @@ void LCR_gameHandleInput(void)
|
|||
{
|
||||
LCR_LOG1("menu open");
|
||||
LCR_gameSetState(LCR_GAME_STATE_MENU);
|
||||
LCR_game.menuSelectedItem = 0;
|
||||
LCR_game.menu.selectedItem = 0;
|
||||
}
|
||||
else if (LCR_game.cameraMode == LCR_CAMERA_MODE_FREE)
|
||||
{
|
||||
|
|
@ -817,7 +816,7 @@ void LCR_gameHandleInput(void)
|
|||
LCR_gameLoadResourceFileChunk(
|
||||
(tabSwitchedTo > 0) ? 0 : (LCR_game.resourceFile.firstItemIndex +
|
||||
scrolled * LCR_RESOURCE_ITEM_CHUNK),
|
||||
LCR_game.menuSelectedTab == 1 ? 'M' : 'R');
|
||||
LCR_game.menu.selectedTab == 1 ? 'M' : 'R');
|
||||
}
|
||||
|
||||
uint8_t LCR_gameStep(uint32_t time)
|
||||
|
|
@ -907,9 +906,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.menuSelectedTab],
|
||||
LCR_game.menuItemNamePointers,LCR_game.menuItemCount + 1,
|
||||
LCR_game.menuSelectedItem);
|
||||
LCR_rendererDrawMenu(LCR_texts[LCR_game.menu.selectedTab],
|
||||
LCR_game.menu.itemNamePtrs,LCR_game.menu.itemCount + 1,
|
||||
LCR_game.menu.selectedItem);
|
||||
else
|
||||
LCR_gameDraw3DView();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue