vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed texture packs gui to be persistance, readded n64 intro

This commit is contained in:
KiritoDev 2021-05-15 22:37:31 -05:00
parent 9a5afacdfa
commit 70049fe39f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
levels/entry.c
View File

@ -13,7 +13,7 @@ const LevelScript level_script_entry[] = {
#ifdef TOGGLE_GAME_DEBUG
EXECUTE(/*seg*/ 0x14, /*script*/ _introSegmentRomStart, /*scriptEnd*/ _introSegmentRomEnd, /*entry*/ level_intro_entry_4),
#else
EXECUTE(/*seg*/ 0x14, /*script*/ _introSegmentRomStart, /*scriptEnd*/ _introSegmentRomEnd, /*entry*/ script_intro_L1),
EXECUTE(/*seg*/ 0x14, /*script*/ _introSegmentRomStart, /*scriptEnd*/ _introSegmentRomEnd, /*entry*/ level_intro_n64),
#endif
JUMP(/*target*/ level_script_entry),
};

2
src/moon/mod-engine/textures/mod-texture.cpp
View File

@ -115,7 +115,6 @@ namespace MoonInternal {
}
cout << "Failed to load texture" << endl;
cout << fullpath << endl;
gfx_rapi->upload_texture(missing_image.pixel_data, missing_image.width, missing_image.height);
}
@ -168,7 +167,6 @@ namespace MoonInternal {
MoonInternal::bindTextureModifiers();
return;
}
// TODO: Implement garbage collector
if(state == "Exit"){
textureMods.clear();
for(auto &addon : Moon::addons){

8
src/moon/ui/screens/addons/addons-view.cpp
View File

@ -31,12 +31,14 @@ enum ItemButtons{
};
void MoonAddonsScreen::Init(){
texturePackList.clear();
if(texturePackList.empty()){
texturePackList.clear();
copy(Moon::addons.begin(), Moon::addons.end(), back_inserter(texturePackList));
reverse(texturePackList.begin(), texturePackList.end());
}
this->scrollIndex = 0;
scrollModifier = 0;
currentPack = NULL;
copy(Moon::addons.begin(), Moon::addons.end(), back_inserter(texturePackList));
reverse(texturePackList.begin(), texturePackList.end());
}
void MoonAddonsScreen::Mount(){