Jeck - "Fix" to issue 247 (see issue for notes), added additional award ("Collection valued over 10,000 credits"), minor enhancement to trophy room UI (floating "O - Details" notification).

The new award will need some art before we ship, but it won't take too much work to add that :)
This commit is contained in:
wagic.jeck
2009-12-15 18:03:42 +00:00
parent 5fc790ff7e
commit b7b48a0ab3
8 changed files with 152 additions and 19 deletions
+1
View File
@@ -65,6 +65,7 @@ public:
MOMIR_MODE_UNLOCKED,
EVILTWIN_MODE_UNLOCKED,
RANDOMDECK_MODE_UNLOCKED,
AWARD_COLLECTOR,
LAST_NAMED, //Any option after this does not look up in optionNames.
SET_UNLOCKS = LAST_NAMED + 1, //For sets.
};
+1
View File
@@ -27,6 +27,7 @@ class GameStateAwards: public GameState, public JGuiListener
public:
GameStateAwards(GameApp* parent);
bool enterSet(int setid);
bool enterStats(int option);
virtual ~GameStateAwards();
virtual void Start();
+6 -3
View File
@@ -149,7 +149,7 @@ public:
virtual JQuad * getImage();
WSrcImage(string s);
private:
protected:
string filename;
};
@@ -242,14 +242,17 @@ protected:
class WGuiAward: public WGuiItem{
public:
WGuiAward(int _id, string name, string _text);
WGuiAward(int _id, string name, string _text, string _details="");
virtual ~WGuiAward();
virtual void Render();
virtual bool Selectable() {return Visible();};
virtual bool Visible();
virtual int getId() {return id;};
virtual void Underlay();
virtual void Overlay();
protected:
string details;
int id;
string text;
};
@@ -345,7 +348,7 @@ protected:
class WGuiHeader:public WGuiItem{
public:
WGuiHeader(string _displayValue): WGuiItem(_displayValue) {};
virtual bool Selectable() {return false;};
virtual void Render();
};
-1
View File
@@ -19,7 +19,6 @@ class PriceList{
int save();
int getPrice(int cardId);
int setPrice(int cardId, int price);
};
#endif