diff --git a/Utils/MapEdit/Elem.cpp b/Utils/MapEdit/Elem.cpp index 26e1a9446..d6e19151c 100644 --- a/Utils/MapEdit/Elem.cpp +++ b/Utils/MapEdit/Elem.cpp @@ -427,7 +427,7 @@ sColTab ColTable[]= { 0,255, 0}, // PC_TILE_COLLISION_SLIPPERY: {255, 0,255}, // PC_TILE_COLLISION_ELECTRIC: {200,127,180}, // PC_TILE_COLLISION_DESTRUCTABLE_WALL: -{ 0, 0,255}, // PC_TILE_COLLISION_DEATH_LIQUID: +{ 0,127,255}, // PC_TILE_COLLISION_SOAK_UP: { 0,255,255}, // PC_TILE_COLLISION_SOLID: {200, 0, 0}, // PC_TILE_COLLISION_DEATH_FALL: {127,200,180}, // PC_TILE_COLLISION_DESTRUCTABLE_FLOOR: @@ -435,7 +435,7 @@ sColTab ColTable[]= { 0,127, 0}, // PC_TILE_COLLISION_MOVE_LEFT: { 0,127,127}, // PC_TILE_COLLISION_MOVE_RIGHT: - +{ 0, 0,255}, // PC_TILE_COLLISION_DEATH_LIQUID: }; @@ -463,25 +463,6 @@ int ColFlags=Flags >> PC_TILE_FLAG_COLLISION_SHIFT; if (ColFlags) { -/* - switch (ColFlags) - { - case PC_TILE_COLLISION_NORMAL: glColor4f(1.0f,1.0f,1.0f,0.5); break; - case PC_TILE_COLLISION_SOLID: glColor4f(0.0f,1.0f,1.0f,0.5); break; - case PC_TILE_COLLISION_SLIPPERY: glColor4f(0.0f,1.0f,0.0f,0.5); break; - case PC_TILE_COLLISION_MOVE_LEFT: glColor4f(0.5f,1.0f,0.0f,0.5); break; - case PC_TILE_COLLISION_MOVE_RIGHT: glColor4f(0.0f,1.0f,0.5f,0.5); break; - - case PC_TILE_COLLISION_DAMAGE: glColor4f(1.0f,0.0f,0.0f,0.5); break; - case PC_TILE_COLLISION_ELECTRIC: glColor4f(1.0f,0.0f,1.0f,0.5); break; - case PC_TILE_COLLISION_DEATH_LIQUID: glColor4f(0.0f,0.0f,1.0f,0.5); break; - case PC_TILE_COLLISION_DEATH_FALL: glColor4f(0.0f,0.5f,0.5f,0.5); break; - case PC_TILE_COLLISION_DEATH_INSTANT: glColor4f(0.1f,0.5f,0.5f,0.5); break; - - case PC_TILE_COLLISION_DESTRUCTABLE_WALL: glColor4f(0.7f,0.5f,0.6f,0.5); break; - case PC_TILE_COLLISION_DESTRUCTABLE_FLOOR: glColor4f(0.5f,0.7f,0.6f,0.5); break; - } -*/ sColTab &ThisCol=ColTable[ColFlags]; glColor4ub(ThisCol.R,ThisCol.G,ThisCol.B,127); } diff --git a/Utils/MapEdit/GUILayerCollision.cpp b/Utils/MapEdit/GUILayerCollision.cpp index 3b5266aaf..0dd737dbc 100644 --- a/Utils/MapEdit/GUILayerCollision.cpp +++ b/Utils/MapEdit/GUILayerCollision.cpp @@ -50,6 +50,7 @@ BEGIN_MESSAGE_MAP(GUILayerCollision, CDialog) ON_BN_CLICKED(IDC_LAYERCOLLISION_NORMAL, OnLayercollisionNormal) ON_BN_CLICKED(IDC_LAYERCOLLISION_SLIPPERY, OnLayercollisionSlippery) ON_BN_CLICKED(IDC_LAYERCOLLISION_SOLID, OnLayercollisionSolid) + ON_BN_CLICKED(IDC_LAYERCOLLISION_SOAK_UP, OnLayercollisionSoakUp) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -70,15 +71,4 @@ void GUILayerCollision::OnLayercollisionDeathInstant() {theApp.GetCurrent()->Com void GUILayerCollision::OnLayercollisionDestructWall() {theApp.GetCurrent()->Command(CmdMsg_SetColFlag,PC_TILE_COLLISION_DESTRUCTABLE_WALL);} void GUILayerCollision::OnLayercollisionDestructFloor() {theApp.GetCurrent()->Command(CmdMsg_SetColFlag,PC_TILE_COLLISION_DESTRUCTABLE_FLOOR);} - - - - - - - - - - - - +void GUILayerCollision::OnLayercollisionSoakUp() {theApp.GetCurrent()->Command(CmdMsg_SetColFlag,PC_TILE_COLLISION_SOAKUP);} diff --git a/Utils/MapEdit/GUILayerCollision.h b/Utils/MapEdit/GUILayerCollision.h index 78be8bbfb..13a7e5696 100644 --- a/Utils/MapEdit/GUILayerCollision.h +++ b/Utils/MapEdit/GUILayerCollision.h @@ -47,6 +47,7 @@ protected: afx_msg void OnLayercollisionNormal(); afx_msg void OnLayercollisionSlippery(); afx_msg void OnLayercollisionSolid(); + afx_msg void OnLayercollisionSoakUp(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/Utils/MapEdit/LayerDef.h b/Utils/MapEdit/LayerDef.h index 03ab633a3..a733b41d1 100644 --- a/Utils/MapEdit/LayerDef.h +++ b/Utils/MapEdit/LayerDef.h @@ -51,13 +51,14 @@ enum TILE_FLAG PC_TILE_COLLISION_SLIPPERY =2, PC_TILE_COLLISION_ELECTRIC =3, PC_TILE_COLLISION_DESTRUCTABLE_WALL =4, - PC_TILE_COLLISION_DEATH_LIQUID =5, + PC_TILE_COLLISION_SOAKUP =5, PC_TILE_COLLISION_SOLID =6, PC_TILE_COLLISION_DEATH_FALL =7, PC_TILE_COLLISION_DESTRUCTABLE_FLOOR =8, PC_TILE_COLLISION_DEATH_INSTANT =9, PC_TILE_COLLISION_MOVE_LEFT =10, PC_TILE_COLLISION_MOVE_RIGHT =11, + PC_TILE_COLLISION_DEATH_LIQUID =12, PC_TILE_FLAG_COLLISION_SHIFT =2, PC_TILE_FLAG_COLLISION_NORMAL =PC_TILE_COLLISION_NORMAL<