aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/clientlauncher.h5
-rw-r--r--src/client/inputhandler.h5
-rw-r--r--src/client/joystick_controller.h5
-rw-r--r--src/client/keys.h5
-rw-r--r--src/client/tile.h4
5 files changed, 5 insertions, 19 deletions
diff --git a/src/client/clientlauncher.h b/src/client/clientlauncher.h
index 6e3741182..2702895d6 100644
--- a/src/client/clientlauncher.h
+++ b/src/client/clientlauncher.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __CLIENT_LAUNCHER_H__
-#define __CLIENT_LAUNCHER_H__
+#pragma once
#include "irrlichttypes_extrabloated.h"
#include "client/inputhandler.h"
@@ -69,5 +68,3 @@ protected:
std::string current_address = "does-not-exist";
int current_port = 0;
};
-
-#endif
diff --git a/src/client/inputhandler.h b/src/client/inputhandler.h
index f14e7d801..249336947 100644
--- a/src/client/inputhandler.h
+++ b/src/client/inputhandler.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef INPUT_HANDLER_H
-#define INPUT_HANDLER_H
+#pragma once
#include "irrlichttypes_extrabloated.h"
#include "joystick_controller.h"
@@ -393,5 +392,3 @@ private:
bool leftreleased = false;
bool rightreleased = false;
};
-
-#endif
diff --git a/src/client/joystick_controller.h b/src/client/joystick_controller.h
index 4a2cdf555..6bea282ee 100644
--- a/src/client/joystick_controller.h
+++ b/src/client/joystick_controller.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef JOYSTICK_HEADER
-#define JOYSTICK_HEADER
+#pragma once
#include "irrlichttypes_extrabloated.h"
#include "keys.h"
@@ -168,5 +167,3 @@ private:
std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_past_pressed_keys;
std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_past_released_keys;
};
-
-#endif
diff --git a/src/client/keys.h b/src/client/keys.h
index d10c96240..7ee286799 100644
--- a/src/client/keys.h
+++ b/src/client/keys.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef KEYS_HEADER
-#define KEYS_HEADER
+#pragma once
#include <list>
@@ -114,5 +113,3 @@ public:
};
typedef KeyType::T GameKeyType;
-
-#endif
diff --git a/src/client/tile.h b/src/client/tile.h
index cd3c3880e..8a8c5bd47 100644
--- a/src/client/tile.h
+++ b/src/client/tile.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef TILE_HEADER
-#define TILE_HEADER
+#pragma once
#include "irrlichttypes.h"
#include "irr_v3d.h"
@@ -330,4 +329,3 @@ struct TileSpec
//! The first is base texture, the second is overlay.
TileLayer layers[MAX_TILE_LAYERS];
};
-#endif