mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2025-10-04 13:27:14 +00:00
Replace #pragma once with #ifndef/#define pairs (to avoid warnings on gcc 2.95)
This commit is contained in:
parent
f369fa48c8
commit
1fdae0c128
52 changed files with 184 additions and 60 deletions
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef ACTIONINPUT_H
|
||||
#define ACTIONINPUT_H
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
@ -53,3 +54,5 @@ enum InputSetType
|
|||
INPUTSET_MOUSE = 3,
|
||||
INPUTSET_OTHER = 4
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef ACTIONSET_H
|
||||
#define ACTIONSET_H
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
@ -47,3 +48,5 @@ public:
|
|||
|
||||
std::string insertInputIntoString(const std::string &string);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef BBGE_BASE_H
|
||||
#define BBGE_BASE_H
|
||||
|
||||
#ifdef BBGE_BUILD_WINDOWS
|
||||
|
||||
|
@ -296,3 +297,5 @@ void openURL(const std::string &url);
|
|||
|
||||
std::string underscoresToSpaces(const std::string &str);
|
||||
std::string spacesToUnderscores(const std::string &str);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef BITMAPFONT_H
|
||||
#define BITMAPFONT_H
|
||||
|
||||
//#include "DrawText.h"
|
||||
#include "RenderObject.h"
|
||||
|
@ -101,3 +102,4 @@ protected:
|
|||
int textWidth;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef BLOOMEFFECT_H
|
||||
#define BLOOMEFFECT_H
|
||||
|
||||
#include "RenderObject.h"
|
||||
#include "FrameBuffer.h"
|
||||
|
@ -44,3 +45,4 @@ protected:
|
|||
bool useFrameBuffer;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef COLLISION_H
|
||||
#define COLLISION_H
|
||||
|
||||
#include "Base.h"
|
||||
|
||||
|
@ -142,3 +143,4 @@ public:
|
|||
};
|
||||
*/
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef COMMONEVENTS_H
|
||||
#define COMMONEVENTS_H
|
||||
|
||||
#include "Event.h"
|
||||
|
||||
|
@ -46,3 +47,5 @@ public:
|
|||
private:
|
||||
std::string state;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef DARKLAYER_H
|
||||
#define DARKLAYER_H
|
||||
|
||||
#include "Base.h"
|
||||
#include "FrameBuffer.h"
|
||||
|
@ -52,3 +53,4 @@ protected:
|
|||
GLuint format;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef DEBUGFONT_H
|
||||
#define DEBUGFONT_H
|
||||
|
||||
#include "Core.h"
|
||||
#include "BaseText.h"
|
||||
|
@ -66,3 +67,4 @@ public:
|
|||
virtual void buttonPress(DebugButton *db){}
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef EFFECTS_H
|
||||
#define EFFECTS_H
|
||||
|
||||
#include "Vector.h"
|
||||
#include "Base.h"
|
||||
|
@ -57,4 +58,5 @@ protected:
|
|||
bool enabled[FXT_MAX];
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef FILEVARS_H
|
||||
#define FILEVARS_H
|
||||
|
||||
#include "Base.h"
|
||||
|
||||
|
@ -34,3 +35,5 @@ protected:
|
|||
std::map<std::string,float> floats;
|
||||
std::map<std::string, int> ints;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef BBGE_FLAGS_H
|
||||
#define BBGE_FLAGS_H
|
||||
|
||||
#ifdef BBGE_BUILD_WINDOWS
|
||||
typedef unsigned __int32 uint32;
|
||||
|
@ -44,3 +45,4 @@ public:
|
|||
uint32 flags;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef FRAMEBUFFER_H
|
||||
#define FRAMEBUFFER_H
|
||||
|
||||
#include "Base.h"
|
||||
|
||||
|
@ -57,3 +58,4 @@ protected:
|
|||
bool enabled, inited;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef GRADIENT_H
|
||||
#define GRADIENT_H
|
||||
|
||||
#include "RenderObject.h"
|
||||
|
||||
|
@ -37,3 +38,5 @@ protected:
|
|||
void onRender();
|
||||
Vector ulc0, ulc1, ulc2, ulc3;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef LENSFLARE_H
|
||||
#define LENSFLARE_H
|
||||
|
||||
#include "Quad.h"
|
||||
|
||||
|
@ -34,3 +35,5 @@ protected:
|
|||
void onUpdate(float dt);
|
||||
std::vector <Quad*> flares;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef BBGE_MODEL_H
|
||||
#define BBGE_MODEL_H
|
||||
|
||||
#include "RenderObject.h"
|
||||
|
||||
|
@ -57,3 +58,5 @@ protected:
|
|||
float m_lodLevel;
|
||||
std::string m_path;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,9 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef POINTSPRITES_H
|
||||
#define POINTSPRITES_H
|
||||
|
||||
#include "Base.h"
|
||||
|
||||
#ifdef BBGE_BUILD_WINDOWS
|
||||
|
@ -34,3 +36,4 @@ public:
|
|||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef PRECACHER_H
|
||||
#define PRECACHER_H
|
||||
|
||||
#include "Quad.h"
|
||||
|
||||
|
@ -37,3 +38,5 @@ private:
|
|||
bool cleaned;
|
||||
void (*loadProgressCallback)();
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef QUADTRAIL_H
|
||||
#define QUADTRAIL_H
|
||||
|
||||
#include "RenderObject.h"
|
||||
|
||||
|
@ -60,3 +61,5 @@ protected:
|
|||
void onRender();
|
||||
void onUpdate(float dt);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef BBGE_RECT_H
|
||||
#define BBGE_RECT_H
|
||||
|
||||
#include "Vector.h"
|
||||
|
||||
|
@ -70,3 +71,5 @@ public:
|
|||
}
|
||||
int x1, y1, x2, y2;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef RENDEROBJECT_INLINE_H
|
||||
#define RENDEROBJECT_INLINE_H
|
||||
|
||||
inline bool RenderObject::isOnScreen()
|
||||
{
|
||||
|
@ -70,3 +71,5 @@ Vector RenderObject::getFollowCameraPosition() const
|
|||
return pos;
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef ROUNDEDRECT_H
|
||||
#define ROUNDEDRECT_H
|
||||
|
||||
#include "RenderObject.h"
|
||||
#include "Event.h"
|
||||
|
@ -67,3 +68,5 @@ protected:
|
|||
bool mbd;
|
||||
bool noNested;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef SCREENTRANSITION_H
|
||||
#define SCREENTRANSITION_H
|
||||
|
||||
#include "RenderObject.h"
|
||||
|
||||
|
@ -46,3 +47,4 @@ protected:
|
|||
#endif
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef SCRIPTOBJECT_H
|
||||
#define SCRIPTOBJECT_H
|
||||
|
||||
enum ScriptObjectType
|
||||
{
|
||||
|
@ -79,3 +80,5 @@ public:
|
|||
// public to allow the static compile check in ScriptInterface.cpp to work
|
||||
ScriptObjectType _objtype;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef BBGE_SHADER_H
|
||||
#define BBGE_SHADER_H
|
||||
|
||||
#include "Base.h"
|
||||
|
||||
|
@ -52,3 +53,5 @@ protected:
|
|||
static bool _wasInited;
|
||||
static bool _useShaders;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef SIMPLEISTRINGSTREAM_H
|
||||
#define SIMPLEISTRINGSTREAM_H
|
||||
|
||||
/*
|
||||
* This class implements a lightweight version of the std::istringstream
|
||||
|
@ -730,6 +731,8 @@ inline SimpleIStringStream &SimpleIStringStream::operator>>(std::string &target)
|
|||
#undef VERIFY_SETUP
|
||||
#undef VERIFY
|
||||
|
||||
#endif // SIMPLEISTRINGSTREAM_H
|
||||
|
||||
/*************************************************************************/
|
||||
/*************************************************************************/
|
||||
|
||||
|
|
|
@ -18,7 +18,9 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef SKELETALSPRITE_H
|
||||
#define SKELETALSPRITE_H
|
||||
|
||||
#include "Quad.h"
|
||||
#include "SimpleIStringStream.h"
|
||||
// for 2d system only
|
||||
|
@ -273,4 +275,4 @@ protected:
|
|||
void onUpdate(float dt);
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef SOUNDMANAGER_H
|
||||
#define SOUNDMANAGER_H
|
||||
|
||||
#include <string>
|
||||
#include <list>
|
||||
|
@ -250,3 +251,5 @@ private:
|
|||
};
|
||||
|
||||
extern SoundManager *sound;
|
||||
|
||||
#endif
|
||||
|
|
|
@ -18,7 +18,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
#pragma once
|
||||
#ifndef BBGE_TTFFONT_H
|
||||
#define BBGE_TTFFONT_H
|
||||
|
||||
#include "Base.h"
|
||||
#include "RenderObject.h"
|
||||
|
@ -69,3 +70,5 @@ protected:
|
|||
TTFFont *font;
|
||||
int hw,h;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue