mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-20 13:30:55 +00:00
Code Issues Releases Wiki Activity

Remove unused stuff

Browse source 
- entity group IDs
- entity node groups (?!)
- WaterFont.[cpp|h]
This commit is contained in:
fgenesis 2012-12-13 19:57:30 +01:00
parent 8b67ece907
commit 0f13f08357
8 changed files with 21 additions and 331 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Aquaria/Game.h
View file

@ -418,7 +418,6 @@ public:
void closeMainMenu();
void setBackgroundGradient();
void addSpringPlant();
bool isOn();
@ -472,12 +471,10 @@ public:
void moveLayer();
void moveElementToLayer(Element *e, int bgLayer);
void toggleElementRepeat();
void setGroup();
bool multiSelecting;
Vector multiSelectPoint;
std::vector <Element*> selectedElements;
void fixEntityIDs();
void bindNodeToEntity();
Vector groupCenter;
Vector getSelectedElementsCenter();
@ -610,9 +607,9 @@ enum ObsType
struct EntitySaveData
{
public:
EntitySaveData(Entity *e, int idx, int x, int y, int rot, int group, int id, const std::string &name) : e(e), idx(idx), x(x), y(y), rot(rot), group(group), id(id), name(name) {}
EntitySaveData(Entity *e, int idx, int x, int y, int rot, int id, const std::string &name) : e(e), idx(idx), x(x), y(y), rot(rot), id(id), name(name) {}
Entity *e;
int idx, x, y, rot, group, id;
int idx, x, y, rot, id;
std::string name;
};
@ -699,7 +696,6 @@ public:
WarpAreas warpAreas;
void postInitEntities();
Entity *getEntityInGroup(int gid, int iter);
EntityClass *getEntityClassForEntityType(const std::string &type);
void warpToArea(WarpArea *area);
@ -744,9 +740,9 @@ public:
MiniMapHint miniMapHint;
void updateMiniMapHintPosition();
EntitySaveData *getEntitySaveDataForEntity(Entity *e, Vector pos);
Entity *createEntity(int idx, int id, Vector position, int rot, bool createSaveData, std::string name, EntityType = ET_ENEMY, Entity::NodeGroups *nodeGroups=0, int groupID=0, bool doPostInit=false);
Entity *createEntity(const std::string &type, int id, Vector position, int rot, bool createSaveData, std::string name, EntityType = ET_ENEMY, Entity::NodeGroups *nodeGroups=0, int groupID=0, bool doPostInit=false);
Entity *establishEntity(Entity *e, int id=0, Vector position=Vector(0,0), int rot=0, bool createSaveData=false, std::string name="", EntityType = ET_ENEMY, Entity::NodeGroups *nodeGroups=0, int groupID=0, bool doPostInit=false);
Entity *createEntity(int idx, int id, Vector position, int rot, bool createSaveData, std::string name, EntityType = ET_ENEMY, bool doPostInit=false);
Entity *createEntity(const std::string &type, int id, Vector position, int rot, bool createSaveData, std::string name, EntityType = ET_ENEMY, bool doPostInit=false);
Entity *establishEntity(Entity *e, int id=0, Vector position=Vector(0,0), int rot=0, bool createSaveData=false, std::string name="", EntityType = ET_ENEMY,bool doPostInit=false);
void setCameraFollow(RenderObject *r);
void setCameraFollowEntity(Entity *e);
void setMenuDescriptionText(const std::string &text);