sigonasr2/AdventuresInLestoria
1
1
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases Wiki Activity

Correct issues with not returning early when an invalid item slot is detected in the level complete window. Release Build 8427.

Browse Source
This commit is contained in:
sigonasr2 2024-03-25 18:00:26 -05:00
parent 6e03f99543
commit b9f9d0ceb2
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Adventures in Lestoria/LevelCompleteWindow.cpp
View File

@ -227,6 +227,7 @@ void Menu::InitializeLevelCompleteWindow(){
return; return;
}else{ }else{
returnData=selectedButton; returnData=selectedButton;
return;
} }
} }
DefaultBehavior{ //When nothing is found... DefaultBehavior{ //When nothing is found...
@ -279,6 +280,7 @@ void Menu::InitializeLevelCompleteWindow(){
return; return;
}else{ }else{
returnData=selectedButton; returnData=selectedButton;
return;
} }
} }
DefaultBehavior{ //When nothing is found... DefaultBehavior{ //When nothing is found...
@ -411,6 +413,7 @@ void Menu::InitializeLevelCompleteWindow(){
return; return;
}else{ }else{
returnData=selectedButton; returnData=selectedButton;
return;
} }
} }
DefaultBehavior{ //When nothing is found... DefaultBehavior{ //When nothing is found...
@ -463,6 +466,7 @@ void Menu::InitializeLevelCompleteWindow(){
return; return;
}else{ }else{
returnData=selectedButton; returnData=selectedButton;
return;
} }
} }
DefaultBehavior{ //When nothing is found... DefaultBehavior{ //When nothing is found...

10
Adventures in Lestoria/TMXParser.h
View File

@ -390,7 +390,7 @@ class TMXParser{
if (newTag.tag.length()==0) { //Tag's empty, so first line is the tag. if (newTag.tag.length()==0) { //Tag's empty, so first line is the tag.
newTag.tag=data; newTag.tag=data;
#if _DEBUG #if _DEBUG
if(_DEBUG_MAP_LOAD_INFO)LOG("Tag: "<<newTag.tag<<"\n"; if(_DEBUG_MAP_LOAD_INFO)LOG("Tag: "<<newTag.tag<<"\n");
#endif #endif
} else { } else {
std::string key = data.substr(0,data.find("=")); std::string key = data.substr(0,data.find("="));
@ -402,7 +402,7 @@ class TMXParser{
newTag.data[key]=value; newTag.data[key]=value;
#if _DEBUG #if _DEBUG
if(_DEBUG_MAP_LOAD_INFO)LOG(" "<<key<<":"<<newTag.data[key]<<"\n"; if(_DEBUG_MAP_LOAD_INFO)LOG(" "<<key<<":"<<newTag.data[key]<<"\n");
#endif #endif
} }
} }
@ -534,11 +534,11 @@ class TMXParser{
prevZoneData=&zones.back(); prevZoneData=&zones.back();
}else{ }else{
#ifdef _DEBUG #ifdef _DEBUG
if(_DEBUG_MAP_LOAD_INFO)LOG("Unsupported tag format! Ignoring."<<"\n"; if(_DEBUG_MAP_LOAD_INFO)LOG("Unsupported tag format! Ignoring."<<"\n");
#endif #endif
} }
#ifdef _DEBUG #ifdef _DEBUG
if(_DEBUG_MAP_LOAD_INFO)LOG("\n"<<"=============\n"; if(_DEBUG_MAP_LOAD_INFO)LOG("\n"<<"=============\n");
#endif #endif
} }
TMXParser::TMXParser(std::string file){ TMXParser::TMXParser(std::string file){
@ -682,7 +682,7 @@ class TMXParser{
} }
#ifdef _DEBUG #ifdef _DEBUG
if(_DEBUG_MAP_LOAD_INFO)LOG("Parsed Map Data:\n"<<parsedMapInfo<<"\n"; if(_DEBUG_MAP_LOAD_INFO)LOG("Parsed Map Data:\n"<<parsedMapInfo<<"\n");
#endif #endif
} }
#endif #endif

2
Adventures in Lestoria/TSXParser.h
View File

@ -194,7 +194,7 @@ class TSXParser{
} }
} }
#ifdef _DEBUG #ifdef _DEBUG
if(_DEBUG_MAP_LOAD_INFO)LOG("\n"<<"=============\n"; if(_DEBUG_MAP_LOAD_INFO)LOG("\n"<<"=============\n");
#endif #endif
} }
TSXParser::TSXParser(std::string file) TSXParser::TSXParser(std::string file)

2
Adventures in Lestoria/Version.h
View File

@ -39,7 +39,7 @@ All rights reserved.
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_PATCH 0 #define VERSION_PATCH 0
#define VERSION_BUILD 8418 #define VERSION_BUILD 8427
#define stringify(a) stringify_(a) #define stringify(a) stringify_(a)
#define stringify_(a) #a #define stringify_(a) #a

1
Adventures in Lestoria/Wizard.cpp
View File

@ -174,7 +174,6 @@ void Wizard::InitializeClassAbilities(){
#pragma region Wizard Ability 3 (Meteor) #pragma region Wizard Ability 3 (Meteor)
Wizard::ability3.action= Wizard::ability3.action=
[](Player*p,vf2d pos={}){ [](Player*p,vf2d pos={}){
p->CastSpell(Wizard::ability3);
game->AddEffect(std::make_unique<Meteor>(pos,3,"meteor.png",p->OnUpperLevel(),vf2d{"Wizard.Ability 3.MeteorRadius"_F/100/4,"Wizard.Ability 3.MeteorRadius"_F/100/4},"Wizard.Ability 3.MeteorFadeoutTime"_F)); game->AddEffect(std::make_unique<Meteor>(pos,3,"meteor.png",p->OnUpperLevel(),vf2d{"Wizard.Ability 3.MeteorRadius"_F/100/4,"Wizard.Ability 3.MeteorRadius"_F/100/4},"Wizard.Ability 3.MeteorFadeoutTime"_F));
return true; return true;
}; };

BIN
x64/Release/Adventures in Lestoria.exe
View File

Binary file not shown.