Archive/Portal64
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

refactoring. remove unused function chapterFindForChamber.

Browse source
This commit is contained in:
hackgrid 2023-12-01 00:32:51 +01:00
parent cd268b9bce
commit 4a7e95a1ba
7 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/levels/levels.h
View file

@ -32,7 +32,7 @@ int levelQuadIndex(struct CollisionObject* pointer);
int getChamberDisplayNumberFromLevelIndex(int levelIndex, int roomIndex);
void levelClearQueuedLevel();
int getLevelIndexFromChamberDisplayNumber(int chamberIndex);
int getLevelIndexFromChamberDisplayNumber(int chamberNumber);
struct Location* levelGetLocation(short index);

2
src/menu/load_game.c
View file

@ -22,7 +22,7 @@ void loadGamePopulate(struct LoadGameMenu* loadGame) {
for (int i = 0; i < numberOfSaves; ++i) {
savefileInfo[i].slotIndex = saveSlots[i].saveSlot;
savefileInfo[i].testchamberIndex = saveSlots[i].testChamber;
savefileInfo[i].testchamberDisplayNumber = saveSlots[i].testChamber;
savefileInfo[i].savefileName = saveSlots[i].saveSlot == 0 ? translationsGet(GAMEUI_AUTOSAVE) : NULL;
savefileInfo[i].screenshot = (u16*)SCREEN_SHOT_SRAM(saveSlots[i].saveSlot);
}

10
src/menu/new_game_menu.c
View file

@ -39,16 +39,6 @@ struct Chapter gChapters[] = {
#define MAX_CHAPTER_COUNT ((sizeof(gChapters) / sizeof(*gChapters)) - 1)
struct Chapter* chapterFindForChamber(int chamberIndex) {
for (int i = 1; i < MAX_CHAPTER_COUNT; ++i) {
if (gChapters[i].testChamberLevelIndex > chamberIndex) {
return &gChapters[i - 1];
}
}
return &gChapters[MAX_CHAPTER_COUNT - 1];
}
void chapterMenuInit(struct ChapterMenu* chapterMenu, int x, int y) {
chapterMenu->chapterText = NULL;
chapterMenu->testChamberText = NULL;

2
src/menu/new_game_menu.h
View file

@ -25,8 +25,6 @@ struct ChapterMenu {
int y;
};
struct Chapter* chapterFindForChamber(int chamberIndex);
void chapterMenuInit(struct ChapterMenu* chapterMenu, int x, int y);
struct NewGameMenu {

4
src/menu/save_game_menu.c
View file

@ -25,7 +25,7 @@ void saveGamePopulate(struct SaveGameMenu* saveGame, int includeNew) {
for (int i = 0; i < numberOfSaves; ++i) {
savefileInfo[i].slotIndex = saveSlots[i].saveSlot;
savefileInfo[i].testchamberIndex = saveSlots[i].testChamber;
savefileInfo[i].testchamberDisplayNumber = saveSlots[i].testChamber;
savefileInfo[i].savefileName = NULL;
savefileInfo[i].screenshot = (u16*)SCREEN_SHOT_SRAM(saveSlots[i].saveSlot);
@ -39,7 +39,7 @@ void saveGamePopulate(struct SaveGameMenu* saveGame, int includeNew) {
if (includeNew && freeSlot != SAVEFILE_NO_SLOT) {
savefileInfo[numberOfSaves].slotIndex = freeSlot;
savefileInfo[numberOfSaves].savefileName = translationsGet(GAMEUI_NEWSAVEGAME);
savefileInfo[numberOfSaves].testchamberIndex = getChamberDisplayNumberFromLevelIndex(gCurrentLevelIndex, gScene.player.body.currentRoom);
savefileInfo[numberOfSaves].testchamberDisplayNumber = getChamberDisplayNumberFromLevelIndex(gCurrentLevelIndex, gScene.player.body.currentRoom);
savefileInfo[numberOfSaves].screenshot = gScreenGrabBuffer;
if (suggestedSlot == 0) {

2
src/menu/savefile_list.c
View file

@ -32,7 +32,7 @@ void savefileListSlotUseInfo(struct SavefileListSlot* savefileListSlot, struct S
}
char message[64];
textManipTestChamberMessage(message, savefileInfo->testchamberIndex);
textManipTestChamberMessage(message, savefileInfo->testchamberDisplayNumber);
savefileListSlot->testChamberText = menuBuildPrerenderedText(&gDejaVuSansFont, message, x + BORDER_WIDTH + 8, y, 120);
if (savefileInfo->savefileName) {

2
src/menu/savefile_list.h
View file

@ -9,7 +9,7 @@
struct SavefileInfo {
short slotIndex;
short testchamberIndex;
short testchamberDisplayNumber;
char* savefileName;
u16* screenshot;
};