Jeck - Fix signed/unsigned in AllAbilities (please review), bug fixes for trophy room (new status now saves).

This commit is contained in:
wagic.jeck
2009-12-13 14:36:58 +00:00
parent 0d39c0177d
commit 608255e251
5 changed files with 23 additions and 5 deletions

View File

@@ -1706,7 +1706,7 @@ class AAsLongAs:public ListMaintainerAbility{
int resolve(){
//TODO check if ability is oneShot ?
updateTargets();
size_t size = cards.size();
int size = (int) cards.size();
if (maxi && size < maxi && (!mini || size > mini)) addAbilityToGame(); //special case for 0
cards.clear();
players.clear();
@@ -1733,7 +1733,7 @@ class AAsLongAs:public ListMaintainerAbility{
}
int _added(Damageable * d){
size_t size = cards.size();
int size = (int) cards.size();
if (maxi && size >= maxi) return removeAbilityFromGame();
if (maxi) return 0;
if (size <= mini) return 0;

View File

@@ -113,11 +113,12 @@ public:
class GameOptionAward: public GameOption {
public:
GameOptionAward();
virtual string menuStr();
virtual bool write(std::ofstream * file, string name);
virtual bool read(string input);
virtual bool giveAward(); //Returns false if already awarded
virtual bool isViewed() {return viewed;};
virtual bool isViewed();
virtual void setViewed(bool v = true) {viewed = v;};
private:
time_t achieved; //When was it awarded?

View File

@@ -20,6 +20,7 @@ class GameStateAwards: public GameState, public JGuiListener
SimpleMenu * menu;
bool showMenu;
bool showAlt;
bool saveMe;
int mState;
int mDetailItem;