differentiate between player loading quest and server preloading all quests
This commit is contained in:
		
							parent
							
								
									f5946013a1
								
							
						
					
					
						commit
						080e939e56
					
				| @ -68,7 +68,7 @@ pub fn quest_detail(id: ClientId, questdetailrequest: &QuestDetailRequest, quest | ||||
|     Ok(Box::new(vec![(id, SendShipPacket::QuestDetail(qd))].into_iter())) | ||||
| } | ||||
| 
 | ||||
| pub fn load_quest(id: ClientId, questmenuselect: &QuestMenuSelect, quests: &QuestList, clients: &mut Clients, client_location: &ClientLocation, rooms: &mut Rooms) | ||||
| pub fn player_chose_quest(id: ClientId, questmenuselect: &QuestMenuSelect, quests: &QuestList, clients: &mut Clients, client_location: &ClientLocation, rooms: &mut Rooms) | ||||
|                   -> Result<Box<dyn Iterator<Item = (ClientId, SendShipPacket)> + Send>, ShipError> { | ||||
|     let (_, category_quests) = quests.iter() | ||||
|         .nth(questmenuselect.category as usize) | ||||
|  | ||||
| @ -595,7 +595,7 @@ impl<EG: EntityGateway> ServerState for ShipServerState<EG> { | ||||
|             }, | ||||
|             RecvShipPacket::QuestMenuSelect(questmenuselect) => { | ||||
|                 let block = self.blocks.with_client(id, &self.clients)?; | ||||
|                 handler::quest::load_quest(id, questmenuselect, &self.quests, &mut self.clients, &block.client_location, &mut block.rooms)? | ||||
|                 handler::quest::player_chose_quest(id, questmenuselect, &self.quests, &mut self.clients, &block.client_location, &mut block.rooms)? | ||||
|             }, | ||||
|             RecvShipPacket::MenuDetail(_menudetail) => { | ||||
|                 //unreachable!();
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user