Correct issues with not returning early when an invalid item slot is detected in the level complete window. Release Build 8427.
This commit is contained in:
		
							parent
							
								
									6e03f99543
								
							
						
					
					
						commit
						b9f9d0ceb2
					
				| @ -227,6 +227,7 @@ void Menu::InitializeLevelCompleteWindow(){ | ||||
| 						return; | ||||
| 					}else{ | ||||
| 						returnData=selectedButton; | ||||
| 						return; | ||||
| 					} | ||||
| 				} | ||||
| 				DefaultBehavior{ //When nothing is found...
 | ||||
| @ -279,6 +280,7 @@ void Menu::InitializeLevelCompleteWindow(){ | ||||
| 						return; | ||||
| 					}else{ | ||||
| 						returnData=selectedButton; | ||||
| 						return; | ||||
| 					} | ||||
| 				} | ||||
| 				DefaultBehavior{ //When nothing is found...
 | ||||
| @ -411,6 +413,7 @@ void Menu::InitializeLevelCompleteWindow(){ | ||||
| 						return; | ||||
| 					}else{ | ||||
| 						returnData=selectedButton; | ||||
| 						return; | ||||
| 					} | ||||
| 				} | ||||
| 				DefaultBehavior{ //When nothing is found...
 | ||||
| @ -463,6 +466,7 @@ void Menu::InitializeLevelCompleteWindow(){ | ||||
| 						return; | ||||
| 					}else{ | ||||
| 						returnData=selectedButton; | ||||
| 						return; | ||||
| 					} | ||||
| 				} | ||||
| 				DefaultBehavior{ //When nothing is found...
 | ||||
|  | ||||
| @ -390,7 +390,7 @@ class TMXParser{ | ||||
|                     if (newTag.tag.length()==0) { //Tag's empty, so first line is the tag.
 | ||||
|                         newTag.tag=data; | ||||
|                         #if _DEBUG | ||||
|                             if(_DEBUG_MAP_LOAD_INFO)LOG("Tag: "<<newTag.tag<<"\n"; | ||||
|                             if(_DEBUG_MAP_LOAD_INFO)LOG("Tag: "<<newTag.tag<<"\n"); | ||||
|                         #endif | ||||
|                     } else { | ||||
|                         std::string key = data.substr(0,data.find("=")); | ||||
| @ -402,7 +402,7 @@ class TMXParser{ | ||||
| 
 | ||||
|                         newTag.data[key]=value; | ||||
|                         #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 | ||||
|                     } | ||||
|                 } | ||||
| @ -534,11 +534,11 @@ class TMXParser{ | ||||
|             prevZoneData=&zones.back(); | ||||
|         }else{ | ||||
|             #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 | ||||
|         } | ||||
|             #ifdef _DEBUG | ||||
|                 if(_DEBUG_MAP_LOAD_INFO)LOG("\n"<<"=============\n"; | ||||
|                 if(_DEBUG_MAP_LOAD_INFO)LOG("\n"<<"=============\n"); | ||||
|             #endif | ||||
|     } | ||||
|     TMXParser::TMXParser(std::string file){ | ||||
| @ -682,7 +682,7 @@ class TMXParser{ | ||||
|         } | ||||
| 
 | ||||
|         #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 | ||||
| @ -194,7 +194,7 @@ class TSXParser{ | ||||
|             } | ||||
|         } | ||||
|         #ifdef _DEBUG | ||||
|             if(_DEBUG_MAP_LOAD_INFO)LOG("\n"<<"=============\n"; | ||||
|             if(_DEBUG_MAP_LOAD_INFO)LOG("\n"<<"=============\n"); | ||||
|         #endif | ||||
|     } | ||||
|     TSXParser::TSXParser(std::string file) | ||||
|  | ||||
| @ -39,7 +39,7 @@ All rights reserved. | ||||
| #define VERSION_MAJOR 1 | ||||
| #define VERSION_MINOR 0 | ||||
| #define VERSION_PATCH 0 | ||||
| #define VERSION_BUILD 8418 | ||||
| #define VERSION_BUILD 8427 | ||||
| 
 | ||||
| #define stringify(a) stringify_(a) | ||||
| #define stringify_(a) #a | ||||
|  | ||||
| @ -174,7 +174,6 @@ void Wizard::InitializeClassAbilities(){ | ||||
|     #pragma region Wizard Ability 3 (Meteor) | ||||
|         Wizard::ability3.action= | ||||
|             [](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)); | ||||
|                 return true; | ||||
|             }; | ||||
|  | ||||
										
											Binary file not shown.
										
									
								
							
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user