Browse Source

Fixed initialization of recruited stacks.
Fixed displaying garrison slots in CCastleInterface.

Michał W. Urbańczyk 14 years ago
parent
commit
591ba76f69
3 changed files with 5 additions and 5 deletions
  1. 1 1
      client/CCastleInterface.cpp
  2. 3 3
      client/GUIClasses.cpp
  3. 1 1
      lib/CCreatureSet.cpp

+ 1 - 1
client/CCastleInterface.cpp

@@ -772,7 +772,7 @@ void CCastleInterface::showAll( SDL_Surface * to/*=NULL*/)
 	statusbar->show(to);
 	resdatabar->draw(to);
 
-	garr->show(to);
+	garr->showAll(to);
 	//draw creatures icons and their growths
 	for(size_t i=0;i<creainfo.size();i++)
 		creainfo[i]->show(to);

+ 3 - 3
client/GUIClasses.cpp

@@ -197,7 +197,7 @@ void CGarrisonSlot::clickLeft(tribool down, bool previousState)
 				for(size_t i = 0; i<owner->splitButtons.size(); i++)
 					owner->splitButtons[i]->block(true);
 
-				show(screen2);
+				redraw();
 				refr = true;
 			}
 			else 
@@ -262,7 +262,7 @@ void CGarrisonSlot::clickLeft(tribool down, bool previousState)
 				{ 
 					if(creature)
 						owner->highlighted = this;
-					show(screen2);
+					redraw();
 					refr = true;
 				}
 			}
@@ -276,7 +276,7 @@ void CGarrisonSlot::clickLeft(tribool down, bool previousState)
 				for(size_t i = 0; i<owner->splitButtons.size(); i++)
 					owner->splitButtons[i]->block(false);
 			}
-			show(screen2);
+			redraw();
 			refr = true;
 		}
 		if(refr) {hover(false);	hover(true); } //to refresh statusbar

+ 1 - 1
lib/CCreatureSet.cpp

@@ -402,7 +402,7 @@ CStackInstance::CStackInstance(const CCreature *cre, TQuantity Count)
 	: armyObj(_armyObj)
 {
 	init();
-	type = cre;
+	setType(cre);
 	count = Count;
 }