mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-06 09:09:40 +02:00
Cleanups/refactoring
This commit is contained in:
21
CLua.h
21
CLua.h
@@ -11,6 +11,7 @@ class CGHeroInstance;
|
||||
class CScriptCallback;
|
||||
class SComponent;
|
||||
class CSelectableComponent;
|
||||
struct Mapa;
|
||||
enum ESLan{UNDEF=-1,CPP,ERM,LUA};
|
||||
class CObjectScript
|
||||
{
|
||||
@@ -69,7 +70,7 @@ public:
|
||||
void findFS(std::string fname);
|
||||
|
||||
|
||||
friend void initGameState(CGameInfo * cgi);
|
||||
friend void initGameState(Mapa * map, CGameInfo * cgi);
|
||||
};
|
||||
|
||||
class CLuaObjectScript : public CLua, public CObjectScript
|
||||
@@ -84,7 +85,7 @@ public:
|
||||
void onHeroVisit(CGObjectInstance *os, int heroID);
|
||||
std::string hoverText(CGObjectInstance *os);
|
||||
|
||||
friend void initGameState(CGameInfo * cgi);
|
||||
friend void initGameState(Mapa * map, CGameInfo * cgi);
|
||||
};
|
||||
class CCPPObjectScript: public CObjectScript
|
||||
{
|
||||
@@ -106,7 +107,7 @@ class CVisitableOPH : public CCPPObjectScript //once per hero
|
||||
std::vector<int> yourObjects(); //returns IDs of objects which are handled by script
|
||||
std::string hoverText(CGObjectInstance *os);
|
||||
|
||||
friend void initGameState(CGameInfo * cgi);
|
||||
friend void initGameState(Mapa * map, CGameInfo * cgi);
|
||||
};
|
||||
|
||||
class CVisitableOPW : public CCPPObjectScript //once per week
|
||||
@@ -120,7 +121,7 @@ class CVisitableOPW : public CCPPObjectScript //once per week
|
||||
std::string hoverText(CGObjectInstance *os);
|
||||
void newTurn ();
|
||||
|
||||
friend void initGameState(CGameInfo * cgi);
|
||||
friend void initGameState(Mapa * map, CGameInfo * cgi);
|
||||
};
|
||||
|
||||
class CMines : public CCPPObjectScript //flaggable, and giving resource at each day
|
||||
@@ -135,7 +136,7 @@ class CMines : public CCPPObjectScript //flaggable, and giving resource at each
|
||||
std::string hoverText(CGObjectInstance *os);
|
||||
void newTurn ();
|
||||
|
||||
friend void initGameState(CGameInfo * cgi);
|
||||
friend void initGameState(Mapa * map, CGameInfo * cgi);
|
||||
};
|
||||
|
||||
class CPickable : public CCPPObjectScript, public IChosen //pickable - resources, artifacts, etc
|
||||
@@ -150,7 +151,7 @@ class CPickable : public CCPPObjectScript, public IChosen //pickable - resource
|
||||
std::string hoverText(CGObjectInstance *os);
|
||||
std::vector<int> yourObjects(); //returns IDs of objects which are handled by script
|
||||
|
||||
friend void initGameState(CGameInfo * cgi);
|
||||
friend void initGameState(Mapa * map, CGameInfo * cgi);
|
||||
};
|
||||
|
||||
class CTownScript : public CCPPObjectScript //pickable - resources, artifacts, etc
|
||||
@@ -161,7 +162,7 @@ class CTownScript : public CCPPObjectScript //pickable - resources, artifacts,
|
||||
std::string hoverText(CGObjectInstance *os);
|
||||
std::vector<int> yourObjects(); //returns IDs of objects which are handled by script
|
||||
|
||||
friend void initGameState(CGameInfo * cgi);
|
||||
friend void initGameState(Mapa * map, CGameInfo * cgi);
|
||||
};
|
||||
|
||||
class CHeroScript : public CCPPObjectScript
|
||||
@@ -173,7 +174,7 @@ class CHeroScript : public CCPPObjectScript
|
||||
std::vector<int> yourObjects(); //returns IDs of objects which are handled by script
|
||||
std::string hoverText(CGObjectInstance *os);
|
||||
|
||||
friend void initGameState(CGameInfo * cgi);
|
||||
friend void initGameState(Mapa * map, CGameInfo * cgi);
|
||||
};
|
||||
|
||||
class CMonsterS : public CCPPObjectScript
|
||||
@@ -185,7 +186,7 @@ class CMonsterS : public CCPPObjectScript
|
||||
void onHeroVisit(CGObjectInstance *os, int heroID);
|
||||
std::vector<int> yourObjects(); //returns IDs of objects which are handled by script
|
||||
|
||||
friend void initGameState(CGameInfo * cgi);
|
||||
friend void initGameState(Mapa * map, CGameInfo * cgi);
|
||||
};
|
||||
|
||||
class CCreatureGen : public CCPPObjectScript
|
||||
@@ -197,5 +198,5 @@ class CCreatureGen : public CCPPObjectScript
|
||||
void onHeroVisit(CGObjectInstance *os, int heroID);
|
||||
std::vector<int> yourObjects(); //returns IDs of objects which are handled by script
|
||||
|
||||
friend void initGameState(CGameInfo * cgi);
|
||||
friend void initGameState(Mapa * map, CGameInfo * cgi);
|
||||
};
|
||||
Reference in New Issue
Block a user