sigonasr2/SeasonI
1
0
Fork 0
generated from sigonasr2/CPlusPlusProjectTemplate
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Remove redundant CURRENT_MAP calls

Browse Source 
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
This commit is contained in:
sigonasr2 2022-10-27 03:58:35 -05:00
parent 345217571a
commit c0f1ac72d4
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.cpp
View File

@ -739,6 +739,7 @@ void SeasonI::SetGameFlag(Flag flag,bool val) {
}
void SeasonI::LoadMap(Map*map) {
CURRENT_MAP=map;
std::ifstream f("assets/maps/"+map->filename,std::ios::binary);
std::ifstream f2("assets/maps/"+map->l2filename,std::ios::binary);
std::ifstream f3("assets/maps/"+map->l3filename,std::ios::binary);
@ -2290,8 +2291,7 @@ void SeasonI::keyUpdates() {
case GameState::MAP_POSITION_SELECT:{
if (GetMouse(0).bReleased) {
LAST_PLACED_TRIGGER->SetExtraCoords(HIGHLIGHTED_TILE*32);
CURRENT_MAP=ORIGINATING_MAP;
LoadMap(CURRENT_MAP);
LoadMap(ORIGINATING_MAP);
CURRENT_MAP->triggers.push_back(LAST_PLACED_TRIGGER);
LAST_PLACED_TRIGGER=nullptr;
GAME_STATE=GameState::EDITOR;
@ -3022,8 +3022,7 @@ void SeasonI::drawGame(){
GetMousePos().x<drawpos.x+16&&
GetMousePos().y>=drawpos.y&&
GetMousePos().y<drawpos.y+24) {
CURRENT_MAP=map;
LoadMap(CURRENT_MAP);
LoadMap(map);
EDITING_LAYER=layer::COLLISION;
EnableLayer(layer::COLLISION,false);
}
@ -3833,7 +3832,6 @@ void SeasonI::HandleCutscenes() {
case ActionType::LOAD_MAP:{
class LoadMap*action=(class LoadMap*)CurrentCutscene->GetAction();
Map*map=action->GetTargetMap();
CURRENT_MAP=map;
LoadMap(map);
CurrentCutscene->AdvanceAction();
}break;