From 2070e7cab82540e0dcb44fe62bae194c613634e2 Mon Sep 17 00:00:00 2001 From: ketmar Date: Sun, 20 May 2012 23:37:33 +0300 Subject: [PATCH] better terrains separation --- src/game/glterrains/0list.cpp | 2 -- src/game/lterrains/0list.cpp | 2 ++ src/game/lterrains/glterrains/0list.cpp | 2 ++ .../glterrains/glterrain_liquidterrain.cpp | 0 .../glterrains/glterrain_solidterrain.cpp | 0 src/game/lterrains/olterrains/0list.cpp | 22 ++++++++++++++++++++++ .../olterrains/decoration_throne.cpp | 0 .../{ => lterrains}/olterrains/door_brokendoor.cpp | 0 .../{ => lterrains}/olterrains/olterrain_altar.cpp | 0 .../olterrains/olterrain_barwall.cpp | 0 .../olterrains/olterrain_boulder.cpp | 0 .../olterrains/olterrain_decoration.cpp | 0 .../{ => lterrains}/olterrains/olterrain_door.cpp | 0 .../{ => lterrains}/olterrains/olterrain_earth.cpp | 0 .../olterrains/olterrain_fountain.cpp | 0 .../olterrains/olterrain_ironmaiden.cpp | 0 .../olterrains/olterrain_monsterportal.cpp | 0 .../olterrains/olterrain_olterraincontainer.cpp | 0 .../{ => lterrains}/olterrains/olterrain_sign.cpp | 0 .../olterrains/olterrain_stairs.cpp | 0 .../{ => lterrains}/olterrains/olterrain_wall.cpp | 0 .../{ => lterrains}/olterrains/olterrain_ward.cpp | 0 .../olterrains/olterraincontainer_coffin.cpp | 0 .../{ => lterrains}/olterrains/stairs_portal.cpp | 0 src/game/lterras.cpp | 3 +-- src/game/lterras.h | 3 +-- src/game/olterrains/0list.cpp | 18 ------------------ 27 files changed, 28 insertions(+), 24 deletions(-) delete mode 100644 src/game/glterrains/0list.cpp create mode 100644 src/game/lterrains/0list.cpp create mode 100644 src/game/lterrains/glterrains/0list.cpp rename src/game/{ => lterrains}/glterrains/glterrain_liquidterrain.cpp (100%) rename src/game/{ => lterrains}/glterrains/glterrain_solidterrain.cpp (100%) create mode 100644 src/game/lterrains/olterrains/0list.cpp rename src/game/{ => lterrains}/olterrains/decoration_throne.cpp (100%) rename src/game/{ => lterrains}/olterrains/door_brokendoor.cpp (100%) rename src/game/{ => lterrains}/olterrains/olterrain_altar.cpp (100%) rename src/game/{ => lterrains}/olterrains/olterrain_barwall.cpp (100%) rename src/game/{ => lterrains}/olterrains/olterrain_boulder.cpp (100%) rename src/game/{ => lterrains}/olterrains/olterrain_decoration.cpp (100%) rename src/game/{ => lterrains}/olterrains/olterrain_door.cpp (100%) rename src/game/{ => lterrains}/olterrains/olterrain_earth.cpp (100%) rename src/game/{ => lterrains}/olterrains/olterrain_fountain.cpp (100%) rename src/game/{ => lterrains}/olterrains/olterrain_ironmaiden.cpp (100%) rename src/game/{ => lterrains}/olterrains/olterrain_monsterportal.cpp (100%) rename src/game/{ => lterrains}/olterrains/olterrain_olterraincontainer.cpp (100%) rename src/game/{ => lterrains}/olterrains/olterrain_sign.cpp (100%) rename src/game/{ => lterrains}/olterrains/olterrain_stairs.cpp (100%) rename src/game/{ => lterrains}/olterrains/olterrain_wall.cpp (100%) rename src/game/{ => lterrains}/olterrains/olterrain_ward.cpp (100%) rename src/game/{ => lterrains}/olterrains/olterraincontainer_coffin.cpp (100%) rename src/game/{ => lterrains}/olterrains/stairs_portal.cpp (100%) delete mode 100644 src/game/olterrains/0list.cpp diff --git a/src/game/glterrains/0list.cpp b/src/game/glterrains/0list.cpp deleted file mode 100644 index a529937..0000000 --- a/src/game/glterrains/0list.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "glterrains/glterrain_solidterrain.cpp" -#include "glterrains/glterrain_liquidterrain.cpp" diff --git a/src/game/lterrains/0list.cpp b/src/game/lterrains/0list.cpp new file mode 100644 index 0000000..a9fe7f9 --- /dev/null +++ b/src/game/lterrains/0list.cpp @@ -0,0 +1,2 @@ +#include "lterrains/olterrains/0list.cpp" +#include "lterrains/glterrains/0list.cpp" diff --git a/src/game/lterrains/glterrains/0list.cpp b/src/game/lterrains/glterrains/0list.cpp new file mode 100644 index 0000000..b65bf86 --- /dev/null +++ b/src/game/lterrains/glterrains/0list.cpp @@ -0,0 +1,2 @@ +#include "lterrains/glterrains/glterrain_liquidterrain.cpp" +#include "lterrains/glterrains/glterrain_solidterrain.cpp" diff --git a/src/game/glterrains/glterrain_liquidterrain.cpp b/src/game/lterrains/glterrains/glterrain_liquidterrain.cpp similarity index 100% rename from src/game/glterrains/glterrain_liquidterrain.cpp rename to src/game/lterrains/glterrains/glterrain_liquidterrain.cpp diff --git a/src/game/glterrains/glterrain_solidterrain.cpp b/src/game/lterrains/glterrains/glterrain_solidterrain.cpp similarity index 100% rename from src/game/glterrains/glterrain_solidterrain.cpp rename to src/game/lterrains/glterrains/glterrain_solidterrain.cpp diff --git a/src/game/lterrains/olterrains/0list.cpp b/src/game/lterrains/olterrains/0list.cpp new file mode 100644 index 0000000..b0561c0 --- /dev/null +++ b/src/game/lterrains/olterrains/0list.cpp @@ -0,0 +1,22 @@ +#include "lterrains/olterrains/olterrain_altar.cpp" +#include "lterrains/olterrains/olterrain_barwall.cpp" +#include "lterrains/olterrains/olterrain_boulder.cpp" +#include "lterrains/olterrains/olterrain_earth.cpp" +#include "lterrains/olterrains/olterrain_fountain.cpp" +#include "lterrains/olterrains/olterrain_ironmaiden.cpp" +#include "lterrains/olterrains/olterrain_monsterportal.cpp" +#include "lterrains/olterrains/olterrain_sign.cpp" +#include "lterrains/olterrains/olterrain_wall.cpp" +#include "lterrains/olterrains/olterrain_ward.cpp" + +#include "lterrains/olterrains/olterrain_stairs.cpp" +#include "lterrains/olterrains/stairs_portal.cpp" + +#include "lterrains/olterrains/olterrain_decoration.cpp" +#include "lterrains/olterrains/decoration_throne.cpp" + +#include "lterrains/olterrains/olterrain_door.cpp" +#include "lterrains/olterrains/door_brokendoor.cpp" + +#include "lterrains/olterrains/olterrain_olterraincontainer.cpp" +#include "lterrains/olterrains/olterraincontainer_coffin.cpp" diff --git a/src/game/olterrains/decoration_throne.cpp b/src/game/lterrains/olterrains/decoration_throne.cpp similarity index 100% rename from src/game/olterrains/decoration_throne.cpp rename to src/game/lterrains/olterrains/decoration_throne.cpp diff --git a/src/game/olterrains/door_brokendoor.cpp b/src/game/lterrains/olterrains/door_brokendoor.cpp similarity index 100% rename from src/game/olterrains/door_brokendoor.cpp rename to src/game/lterrains/olterrains/door_brokendoor.cpp diff --git a/src/game/olterrains/olterrain_altar.cpp b/src/game/lterrains/olterrains/olterrain_altar.cpp similarity index 100% rename from src/game/olterrains/olterrain_altar.cpp rename to src/game/lterrains/olterrains/olterrain_altar.cpp diff --git a/src/game/olterrains/olterrain_barwall.cpp b/src/game/lterrains/olterrains/olterrain_barwall.cpp similarity index 100% rename from src/game/olterrains/olterrain_barwall.cpp rename to src/game/lterrains/olterrains/olterrain_barwall.cpp diff --git a/src/game/olterrains/olterrain_boulder.cpp b/src/game/lterrains/olterrains/olterrain_boulder.cpp similarity index 100% rename from src/game/olterrains/olterrain_boulder.cpp rename to src/game/lterrains/olterrains/olterrain_boulder.cpp diff --git a/src/game/olterrains/olterrain_decoration.cpp b/src/game/lterrains/olterrains/olterrain_decoration.cpp similarity index 100% rename from src/game/olterrains/olterrain_decoration.cpp rename to src/game/lterrains/olterrains/olterrain_decoration.cpp diff --git a/src/game/olterrains/olterrain_door.cpp b/src/game/lterrains/olterrains/olterrain_door.cpp similarity index 100% rename from src/game/olterrains/olterrain_door.cpp rename to src/game/lterrains/olterrains/olterrain_door.cpp diff --git a/src/game/olterrains/olterrain_earth.cpp b/src/game/lterrains/olterrains/olterrain_earth.cpp similarity index 100% rename from src/game/olterrains/olterrain_earth.cpp rename to src/game/lterrains/olterrains/olterrain_earth.cpp diff --git a/src/game/olterrains/olterrain_fountain.cpp b/src/game/lterrains/olterrains/olterrain_fountain.cpp similarity index 100% rename from src/game/olterrains/olterrain_fountain.cpp rename to src/game/lterrains/olterrains/olterrain_fountain.cpp diff --git a/src/game/olterrains/olterrain_ironmaiden.cpp b/src/game/lterrains/olterrains/olterrain_ironmaiden.cpp similarity index 100% rename from src/game/olterrains/olterrain_ironmaiden.cpp rename to src/game/lterrains/olterrains/olterrain_ironmaiden.cpp diff --git a/src/game/olterrains/olterrain_monsterportal.cpp b/src/game/lterrains/olterrains/olterrain_monsterportal.cpp similarity index 100% rename from src/game/olterrains/olterrain_monsterportal.cpp rename to src/game/lterrains/olterrains/olterrain_monsterportal.cpp diff --git a/src/game/olterrains/olterrain_olterraincontainer.cpp b/src/game/lterrains/olterrains/olterrain_olterraincontainer.cpp similarity index 100% rename from src/game/olterrains/olterrain_olterraincontainer.cpp rename to src/game/lterrains/olterrains/olterrain_olterraincontainer.cpp diff --git a/src/game/olterrains/olterrain_sign.cpp b/src/game/lterrains/olterrains/olterrain_sign.cpp similarity index 100% rename from src/game/olterrains/olterrain_sign.cpp rename to src/game/lterrains/olterrains/olterrain_sign.cpp diff --git a/src/game/olterrains/olterrain_stairs.cpp b/src/game/lterrains/olterrains/olterrain_stairs.cpp similarity index 100% rename from src/game/olterrains/olterrain_stairs.cpp rename to src/game/lterrains/olterrains/olterrain_stairs.cpp diff --git a/src/game/olterrains/olterrain_wall.cpp b/src/game/lterrains/olterrains/olterrain_wall.cpp similarity index 100% rename from src/game/olterrains/olterrain_wall.cpp rename to src/game/lterrains/olterrains/olterrain_wall.cpp diff --git a/src/game/olterrains/olterrain_ward.cpp b/src/game/lterrains/olterrains/olterrain_ward.cpp similarity index 100% rename from src/game/olterrains/olterrain_ward.cpp rename to src/game/lterrains/olterrains/olterrain_ward.cpp diff --git a/src/game/olterrains/olterraincontainer_coffin.cpp b/src/game/lterrains/olterrains/olterraincontainer_coffin.cpp similarity index 100% rename from src/game/olterrains/olterraincontainer_coffin.cpp rename to src/game/lterrains/olterrains/olterraincontainer_coffin.cpp diff --git a/src/game/olterrains/stairs_portal.cpp b/src/game/lterrains/olterrains/stairs_portal.cpp similarity index 100% rename from src/game/olterrains/stairs_portal.cpp rename to src/game/lterrains/olterrains/stairs_portal.cpp diff --git a/src/game/lterras.cpp b/src/game/lterras.cpp index 9d7155e..38f023e 100644 --- a/src/game/lterras.cpp +++ b/src/game/lterras.cpp @@ -11,5 +11,4 @@ */ /* Compiled through levelset.cpp */ -#include "olterrains/0list.cpp" -#include "glterrains/0list.cpp" +#include "lterrains/0list.cpp" diff --git a/src/game/lterras.h b/src/game/lterras.h index 62c5f90..65ee4f8 100644 --- a/src/game/lterras.h +++ b/src/game/lterras.h @@ -17,8 +17,7 @@ #define HEADER_PHASE -#include "olterrains/0list.cpp" -#include "glterrains/0list.cpp" +#include "lterrains/0list.cpp" #undef HEADER_PHASE diff --git a/src/game/olterrains/0list.cpp b/src/game/olterrains/0list.cpp deleted file mode 100644 index e6d51e6..0000000 --- a/src/game/olterrains/0list.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "olterrains/olterrain_wall.cpp" -#include "olterrains/olterrain_decoration.cpp" -#include "olterrains/olterrain_door.cpp" -#include "olterrains/olterrain_stairs.cpp" -#include "olterrains/stairs_portal.cpp" -#include "olterrains/olterrain_altar.cpp" -#include "olterrains/decoration_throne.cpp" -#include "olterrains/olterrain_olterraincontainer.cpp" -#include "olterrains/olterrain_fountain.cpp" -#include "olterrains/door_brokendoor.cpp" -#include "olterrains/olterrain_boulder.cpp" -#include "olterrains/olterrain_sign.cpp" -#include "olterrains/olterrain_earth.cpp" -#include "olterrains/olterrain_monsterportal.cpp" -#include "olterrains/olterraincontainer_coffin.cpp" -#include "olterrains/olterrain_barwall.cpp" -#include "olterrains/olterrain_ironmaiden.cpp" -#include "olterrains/olterrain_ward.cpp" -- 2.11.4.GIT