diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-08-30 21:31:01 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-08-30 21:31:01 +0000 |
| commit | 432602c4ca5d47aee91d25271fa57ad0f6d67250 (patch) | |
| tree | 37e8ed31d495ef62753888e3703e3ef338a4f99b /src/game/client | |
| parent | 374714f64174101a71a6674fc85c215d1cf1d067 (diff) | |
| download | zcatch-432602c4ca5d47aee91d25271fa57ad0f6d67250.tar.gz zcatch-432602c4ca5d47aee91d25271fa57ad0f6d67250.zip | |
renamed gc_ui.* to ui.*
Diffstat (limited to 'src/game/client')
| -rw-r--r-- | src/game/client/components/console.cpp | 2 | ||||
| -rw-r--r-- | src/game/client/components/damageind.cpp | 2 | ||||
| -rw-r--r-- | src/game/client/components/emoticon.cpp | 2 | ||||
| -rw-r--r-- | src/game/client/components/items.cpp | 2 | ||||
| -rw-r--r-- | src/game/client/components/menus.cpp | 2 | ||||
| -rw-r--r-- | src/game/client/components/menus.hpp | 2 | ||||
| -rw-r--r-- | src/game/client/components/menus_browser.cpp | 2 | ||||
| -rw-r--r-- | src/game/client/components/menus_settings.cpp | 2 | ||||
| -rw-r--r-- | src/game/client/components/players.cpp | 2 | ||||
| -rw-r--r-- | src/game/client/gc_render.hpp | 2 | ||||
| -rw-r--r-- | src/game/client/ui.cpp (renamed from src/game/client/gc_ui.cpp) | 2 | ||||
| -rw-r--r-- | src/game/client/ui.hpp (renamed from src/game/client/gc_ui.hpp) | 4 |
12 files changed, 13 insertions, 13 deletions
diff --git a/src/game/client/components/console.cpp b/src/game/client/components/console.cpp index 9b5161a0..fe2ecfa5 100644 --- a/src/game/client/components/console.cpp +++ b/src/game/client/components/console.cpp @@ -15,7 +15,7 @@ extern "C" { #include <cstring> #include <cstdio> -#include <game/client/gc_ui.hpp> +#include <game/client/ui.hpp> #include <game/version.hpp> diff --git a/src/game/client/components/damageind.cpp b/src/game/client/components/damageind.cpp index 15ca4b18..f6176346 100644 --- a/src/game/client/components/damageind.cpp +++ b/src/game/client/components/damageind.cpp @@ -3,7 +3,7 @@ #include <game/generated/gc_data.hpp> #include <game/gamecore.hpp> // get_angle -#include <game/client/gc_ui.hpp> +#include <game/client/ui.hpp> #include <game/client/gc_render.hpp> #include "damageind.hpp" diff --git a/src/game/client/components/emoticon.cpp b/src/game/client/components/emoticon.cpp index 75859f60..bed050dd 100644 --- a/src/game/client/components/emoticon.cpp +++ b/src/game/client/components/emoticon.cpp @@ -4,7 +4,7 @@ #include <game/gamecore.hpp> // get_angle #include <game/client/gameclient.hpp> -#include <game/client/gc_ui.hpp> +#include <game/client/ui.hpp> #include <game/client/gc_render.hpp> #include "emoticon.hpp" diff --git a/src/game/client/components/items.cpp b/src/game/client/components/items.cpp index 940c39fd..43ad3319 100644 --- a/src/game/client/components/items.cpp +++ b/src/game/client/components/items.cpp @@ -4,7 +4,7 @@ #include <game/gamecore.hpp> // get_angle #include <game/client/gameclient.hpp> -#include <game/client/gc_ui.hpp> +#include <game/client/ui.hpp> #include <game/client/gc_render.hpp> #include <game/client/components/flow.hpp> diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp index 4893d0ea..4284f84c 100644 --- a/src/game/client/components/menus.cpp +++ b/src/game/client/components/menus.cpp @@ -25,7 +25,7 @@ extern "C" { #include <game/client/gameclient.hpp> #include <game/client/animstate.hpp> #include <game/client/gc_render.hpp> -#include <game/client/gc_ui.hpp> +#include <game/client/ui.hpp> #include <mastersrv/mastersrv.h> vec4 MENUS::gui_color; diff --git a/src/game/client/components/menus.hpp b/src/game/client/components/menus.hpp index 6caaa479..71128498 100644 --- a/src/game/client/components/menus.hpp +++ b/src/game/client/components/menus.hpp @@ -1,7 +1,7 @@ #include <base/vmath.hpp> #include <game/client/component.hpp> -#include <game/client/gc_ui.hpp> +#include <game/client/ui.hpp> class MENUS : public COMPONENT { diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp index fae6df5b..e2e1ae9e 100644 --- a/src/game/client/components/menus_browser.cpp +++ b/src/game/client/components/menus_browser.cpp @@ -11,7 +11,7 @@ extern "C" { #include <game/generated/g_protocol.hpp> #include <game/generated/gc_data.hpp> -#include <game/client/gc_ui.hpp> +#include <game/client/ui.hpp> #include <game/client/gc_render.hpp> #include "menus.hpp" diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index f031c20f..95a097c2 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -13,7 +13,7 @@ extern "C" { #include <game/generated/g_protocol.hpp> #include <game/generated/gc_data.hpp> -#include <game/client/gc_ui.hpp> +#include <game/client/ui.hpp> #include <game/client/gc_render.hpp> #include <game/client/gameclient.hpp> #include <game/client/animstate.hpp> diff --git a/src/game/client/components/players.cpp b/src/game/client/components/players.cpp index 1d4452d4..f2d81323 100644 --- a/src/game/client/components/players.cpp +++ b/src/game/client/components/players.cpp @@ -5,7 +5,7 @@ #include <game/gamecore.hpp> // get_angle #include <game/client/animstate.hpp> #include <game/client/gameclient.hpp> -#include <game/client/gc_ui.hpp> +#include <game/client/ui.hpp> #include <game/client/gc_render.hpp> #include <game/client/components/flow.hpp> diff --git a/src/game/client/gc_render.hpp b/src/game/client/gc_render.hpp index ae2b7097..280f0532 100644 --- a/src/game/client/gc_render.hpp +++ b/src/game/client/gc_render.hpp @@ -5,7 +5,7 @@ #include <base/vmath.hpp> #include "../mapitems.hpp" -#include "gc_ui.hpp" +#include "ui.hpp" struct TEE_RENDER_INFO { diff --git a/src/game/client/gc_ui.cpp b/src/game/client/ui.cpp index e873cc86..1361b85c 100644 --- a/src/game/client/gc_ui.cpp +++ b/src/game/client/ui.cpp @@ -3,7 +3,7 @@ #include <engine/e_client_interface.h> #include <engine/e_config.h> -#include "gc_ui.hpp" +#include "ui.hpp" /******************************************************** UI diff --git a/src/game/client/gc_ui.hpp b/src/game/client/ui.hpp index 26c4dcdb..7a6cb5de 100644 --- a/src/game/client/gc_ui.hpp +++ b/src/game/client/ui.hpp @@ -1,6 +1,6 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ -#ifndef _UI_H -#define _UI_H +#ifndef FILE_GAME_CLIENT_UI_H +#define FILE_GAME_CLIENT_UI_H typedef struct { |