J :

* Remove ^M's. * Re-indent automatically. * Remove whitespace at the end of lines.
2008-11-12 13:45:42 +00:00
parent 6ad6f9b668
commit c97dd1f260
116 changed files with 18073 additions and 18073 deletions
--- a/projects/mtg/include/ShopItem.h
+++ b/projects/mtg/include/ShopItem.h
@@ -1,71 +1,71 @@
-#ifndef _SHOP_ITEM_H
-#define _SHOP_ITEM_H
-
-#include <JGui.h>
-#include <JLBFont.h>
-#include "SimpleMenu.h"
-#include "MTGDeck.h"
-#include "../include/PriceList.h"
-#include "../include/PlayerData.h"
-#include "../include/CardDisplay.h"
-
-#include <string>
-using std::string;
-
-class ShopItem:public JGuiObject{
-private:
-	bool mHasFocus;
-	JLBFont *mFont;
-	string mText;
-	int mX;
-	int mY;
-	JQuad * quad;
-	JQuad * thumb;
-	float mScale;
-	float mTargetScale;
-
-public:
-	int quantity;
-	MTGCard * card;
-	int price;
-	ShopItem(int id, JLBFont * font, int _cardid, int x, int y, bool hasFocus, MTGAllCards * collection, int _price);
-	ShopItem(int id, JLBFont * font, char* text, JQuad * _quad, JQuad * _thumb,int x, int y, bool hasFocus, int _price);
-	~ShopItem();
-	
-	virtual void Render();
-	virtual void Update(float dt);
-
-	virtual void Entering();
-	virtual bool Leaving(u32 key);
-	virtual bool ButtonPressed();
-
-	const char * getText();
-};
-
-class ShopItems:public JGuiController,public JGuiListener{
-private:
-	PlayerData * playerdata;
-	PriceList * pricelist;
-	int  mX, mY, mHeight;
-	JLBFont* mFont;
-	MTGAllCards * collection;
-	SimpleMenu * dialog;
-	int showPriceDialog;
-	int setId;
-	MTGCardInstance * displayCards[100];
-	CardDisplay * display;
-	void safeDeleteDisplay();
-public:
-	ShopItems(int id, JGuiListener* listener, JLBFont* font, int x, int y, MTGAllCards * _collection, int setId);
-	~ShopItems();
-	void Render();
-	virtual void Update(float dt);
-	void Add(int cardid);
-	void Add(char * text, JQuad * quad, JQuad * thumb,int _price);
-	void pricedialog(int id, int mode=1);
-	virtual void ButtonPressed(int controllerId, int controlId);
-	void savePriceList();
-	void saveAll();
-};
-
-#endif
+#ifndef _SHOP_ITEM_H
+#define _SHOP_ITEM_H
+
+#include <JGui.h>
+#include <JLBFont.h>
+#include "SimpleMenu.h"
+#include "MTGDeck.h"
+#include "../include/PriceList.h"
+#include "../include/PlayerData.h"
+#include "../include/CardDisplay.h"
+
+#include <string>
+using std::string;
+
+class ShopItem:public JGuiObject{
+ private:
+  bool mHasFocus;
+  JLBFont *mFont;
+  string mText;
+  int mX;
+  int mY;
+  JQuad * quad;
+  JQuad * thumb;
+  float mScale;
+  float mTargetScale;
+
+ public:
+  int quantity;
+  MTGCard * card;
+  int price;
+  ShopItem(int id, JLBFont * font, int _cardid, int x, int y, bool hasFocus, MTGAllCards * collection, int _price);
+  ShopItem(int id, JLBFont * font, char* text, JQuad * _quad, JQuad * _thumb,int x, int y, bool hasFocus, int _price);
+  ~ShopItem();
+
+  virtual void Render();
+  virtual void Update(float dt);
+
+  virtual void Entering();
+  virtual bool Leaving(u32 key);
+  virtual bool ButtonPressed();
+
+  const char * getText();
+};
+
+class ShopItems:public JGuiController,public JGuiListener{
+ private:
+  PlayerData * playerdata;
+  PriceList * pricelist;
+  int  mX, mY, mHeight;
+  JLBFont* mFont;
+  MTGAllCards * collection;
+  SimpleMenu * dialog;
+  int showPriceDialog;
+  int setId;
+  MTGCardInstance * displayCards[100];
+  CardDisplay * display;
+  void safeDeleteDisplay();
+ public:
+  ShopItems(int id, JGuiListener* listener, JLBFont* font, int x, int y, MTGAllCards * _collection, int setId);
+  ~ShopItems();
+  void Render();
+  virtual void Update(float dt);
+  void Add(int cardid);
+  void Add(char * text, JQuad * quad, JQuad * thumb,int _price);
+  void pricedialog(int id, int mode=1);
+  virtual void ButtonPressed(int controllerId, int controlId);
+  void savePriceList();
+  void saveAll();
+};
+
+#endif