Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Daveo 2001-05-31 14:00:48 +00:00
parent 59a515fabf
commit f54c11a926
7 changed files with 32 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Utils/MapEdit/Elem.cpp
View File

@ -427,7 +427,7 @@ sColTab ColTable[]=
{ 0,255, 0}, // PC_TILE_COLLISION_SLIPPERY: { 0,255, 0}, // PC_TILE_COLLISION_SLIPPERY:
{255, 0,255}, // PC_TILE_COLLISION_ELECTRIC: {255, 0,255}, // PC_TILE_COLLISION_ELECTRIC:
{200,127,180}, // PC_TILE_COLLISION_DESTRUCTABLE_WALL: {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: { 0,255,255}, // PC_TILE_COLLISION_SOLID:
{200, 0, 0}, // PC_TILE_COLLISION_DEATH_FALL: {200, 0, 0}, // PC_TILE_COLLISION_DEATH_FALL:
{127,200,180}, // PC_TILE_COLLISION_DESTRUCTABLE_FLOOR: {127,200,180}, // PC_TILE_COLLISION_DESTRUCTABLE_FLOOR:
@ -435,7 +435,7 @@ sColTab ColTable[]=
{ 0,127, 0}, // PC_TILE_COLLISION_MOVE_LEFT: { 0,127, 0}, // PC_TILE_COLLISION_MOVE_LEFT:
{ 0,127,127}, // PC_TILE_COLLISION_MOVE_RIGHT: { 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) 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]; sColTab &ThisCol=ColTable[ColFlags];
glColor4ub(ThisCol.R,ThisCol.G,ThisCol.B,127); glColor4ub(ThisCol.R,ThisCol.G,ThisCol.B,127);
} }

14
Utils/MapEdit/GUILayerCollision.cpp
View File

@ -50,6 +50,7 @@ BEGIN_MESSAGE_MAP(GUILayerCollision, CDialog)
ON_BN_CLICKED(IDC_LAYERCOLLISION_NORMAL, OnLayercollisionNormal) ON_BN_CLICKED(IDC_LAYERCOLLISION_NORMAL, OnLayercollisionNormal)
ON_BN_CLICKED(IDC_LAYERCOLLISION_SLIPPERY, OnLayercollisionSlippery) ON_BN_CLICKED(IDC_LAYERCOLLISION_SLIPPERY, OnLayercollisionSlippery)
ON_BN_CLICKED(IDC_LAYERCOLLISION_SOLID, OnLayercollisionSolid) ON_BN_CLICKED(IDC_LAYERCOLLISION_SOLID, OnLayercollisionSolid)
ON_BN_CLICKED(IDC_LAYERCOLLISION_SOAK_UP, OnLayercollisionSoakUp)
//}}AFX_MSG_MAP //}}AFX_MSG_MAP
END_MESSAGE_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::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::OnLayercollisionDestructFloor() {theApp.GetCurrent()->Command(CmdMsg_SetColFlag,PC_TILE_COLLISION_DESTRUCTABLE_FLOOR);}
void GUILayerCollision::OnLayercollisionSoakUp() {theApp.GetCurrent()->Command(CmdMsg_SetColFlag,PC_TILE_COLLISION_SOAKUP);}

1
Utils/MapEdit/GUILayerCollision.h
View File

@ -47,6 +47,7 @@ protected:
afx_msg void OnLayercollisionNormal(); afx_msg void OnLayercollisionNormal();
afx_msg void OnLayercollisionSlippery(); afx_msg void OnLayercollisionSlippery();
afx_msg void OnLayercollisionSolid(); afx_msg void OnLayercollisionSolid();
afx_msg void OnLayercollisionSoakUp();
//}}AFX_MSG //}}AFX_MSG
DECLARE_MESSAGE_MAP() DECLARE_MESSAGE_MAP()
}; };

4
Utils/MapEdit/LayerDef.h
View File

@ -51,13 +51,14 @@ enum TILE_FLAG
PC_TILE_COLLISION_SLIPPERY =2, PC_TILE_COLLISION_SLIPPERY =2,
PC_TILE_COLLISION_ELECTRIC =3, PC_TILE_COLLISION_ELECTRIC =3,
PC_TILE_COLLISION_DESTRUCTABLE_WALL =4, 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_SOLID =6,
PC_TILE_COLLISION_DEATH_FALL =7, PC_TILE_COLLISION_DEATH_FALL =7,
PC_TILE_COLLISION_DESTRUCTABLE_FLOOR =8, PC_TILE_COLLISION_DESTRUCTABLE_FLOOR =8,
PC_TILE_COLLISION_DEATH_INSTANT =9, PC_TILE_COLLISION_DEATH_INSTANT =9,
PC_TILE_COLLISION_MOVE_LEFT =10, PC_TILE_COLLISION_MOVE_LEFT =10,
PC_TILE_COLLISION_MOVE_RIGHT =11, PC_TILE_COLLISION_MOVE_RIGHT =11,
PC_TILE_COLLISION_DEATH_LIQUID =12,
PC_TILE_FLAG_COLLISION_SHIFT =2, PC_TILE_FLAG_COLLISION_SHIFT =2,
PC_TILE_FLAG_COLLISION_NORMAL =PC_TILE_COLLISION_NORMAL<<PC_TILE_FLAG_COLLISION_SHIFT, PC_TILE_FLAG_COLLISION_NORMAL =PC_TILE_COLLISION_NORMAL<<PC_TILE_FLAG_COLLISION_SHIFT,
@ -65,6 +66,7 @@ enum TILE_FLAG
PC_TILE_FLAG_COLLISION_SLIPPERY =PC_TILE_COLLISION_SLIPPERY<<PC_TILE_FLAG_COLLISION_SHIFT, PC_TILE_FLAG_COLLISION_SLIPPERY =PC_TILE_COLLISION_SLIPPERY<<PC_TILE_FLAG_COLLISION_SHIFT,
PC_TILE_FLAG_COLLISION_MOVE_LEFT =PC_TILE_COLLISION_MOVE_LEFT<<PC_TILE_FLAG_COLLISION_SHIFT, PC_TILE_FLAG_COLLISION_MOVE_LEFT =PC_TILE_COLLISION_MOVE_LEFT<<PC_TILE_FLAG_COLLISION_SHIFT,
PC_TILE_FLAG_COLLISION_MOVE_RIGHT =PC_TILE_COLLISION_MOVE_RIGHT<<PC_TILE_FLAG_COLLISION_SHIFT, PC_TILE_FLAG_COLLISION_MOVE_RIGHT =PC_TILE_COLLISION_MOVE_RIGHT<<PC_TILE_FLAG_COLLISION_SHIFT,
PC_TILE_FLAG_COLLISION_SOAKUP =PC_TILE_COLLISION_SOAKUP<<PC_TILE_FLAG_COLLISION_SHIFT,
PC_TILE_FLAG_COLLISION_DAMAGE =PC_TILE_COLLISION_DAMAGE<<PC_TILE_FLAG_COLLISION_SHIFT, PC_TILE_FLAG_COLLISION_DAMAGE =PC_TILE_COLLISION_DAMAGE<<PC_TILE_FLAG_COLLISION_SHIFT,
PC_TILE_FLAG_COLLISION_ELECTRIC =PC_TILE_COLLISION_ELECTRIC<<PC_TILE_FLAG_COLLISION_SHIFT, PC_TILE_FLAG_COLLISION_ELECTRIC =PC_TILE_COLLISION_ELECTRIC<<PC_TILE_FLAG_COLLISION_SHIFT,

43
Utils/MapEdit/MapEdit.clw
View File

@ -37,26 +37,26 @@ Class25=CMapEditDoc
Class26=CMapEditView Class26=CMapEditView
ResourceCount=21 ResourceCount=21
Resource1=IDD_LAYER_PLATFORM Resource1=IDD_LAYER_THING
Resource2=IDR_MAINFRAME (English (U.S.)) Resource2=IDD_LAYER_FX
Resource3=IDD_TILEBANK Resource3=IDD_NEWMAP
Resource4=IDR_TOOLBAR (English (U.S.)) Resource4=IDD_LAYER_TRIGGER
Resource5=IDD_LAYER_SHADE Resource5=IDD_TILEBANK
Resource6=IDD_ELEMLIST Resource6=IDD_LAYER_SHADE
Resource7=IDD_LAYER_THING_POS Resource7=IDD_LAYER_ACTOR
Resource8=IDD_LAYER_ACTOR Resource8=IDD_LAYER_COLLISION
Resource9=IDD_LAYER_COLLISION Resource9=IDD_TOOLBAR
Resource10=IDD_ABOUTBOX (English (U.S.)) Resource10=IDR_TOOLBAR (English (U.S.))
Resource11=IDR_MAPEDITYPE (English (U.S.)) Resource11=IDR_MAPEDITYPE (English (U.S.))
Resource12=IDD_LAYER_THING Resource12=IDD_ELEMLIST
Resource13=IDD_TOOLBAR Resource13=IDD_ADDLAYER
Resource14=IDD_LAYER_FX Resource14=IDD_LAYER_PLATFORM
Resource15=IDD_ADDLAYER Resource15=IDD_RESIZE
Resource16=IDD_MULTIBAR (English (U.S.)) Resource16=IDR_MAINFRAME (English (U.S.))
Resource17=IDD_LAYER_LIST Resource17=IDD_ABOUTBOX (English (U.S.))
Resource18=IDD_LAYER_TRIGGER Resource18=IDD_LAYER_THING_POS
Resource19=IDD_RESIZE Resource19=IDD_MULTIBAR (English (U.S.))
Resource20=IDD_NEWMAP Resource20=IDD_LAYER_LIST
Resource21=IDD_LAYER_HAZARD Resource21=IDD_LAYER_HAZARD
[CLS:CChildFrame] [CLS:CChildFrame]
@ -94,7 +94,7 @@ Type=0
BaseClass=CDialog BaseClass=CDialog
HeaderFile=GUILayerCollision.h HeaderFile=GUILayerCollision.h
ImplementationFile=GUILayerCollision.cpp ImplementationFile=GUILayerCollision.cpp
LastObject=IDC_LAYERCOLLISION_SOLID LastObject=IDC_LAYERCOLLISION_SOAK_UP
Filter=D Filter=D
VirtualFilter=dWC VirtualFilter=dWC
@ -270,7 +270,7 @@ Control14=IDC_ACTOR_COLLISION,button,1342243363
[DLG:IDD_LAYER_COLLISION] [DLG:IDD_LAYER_COLLISION]
Type=1 Type=1
Class=GUILayerCollision Class=GUILayerCollision
ControlCount=12 ControlCount=13
Control1=IDC_LAYERCOLLISION_NORMAL,button,1342242816 Control1=IDC_LAYERCOLLISION_NORMAL,button,1342242816
Control2=IDC_LAYERCOLLISION_DAMAGE,button,1342242816 Control2=IDC_LAYERCOLLISION_DAMAGE,button,1342242816
Control3=IDC_LAYERCOLLISION_SLIPPERY,button,1342242816 Control3=IDC_LAYERCOLLISION_SLIPPERY,button,1342242816
@ -283,6 +283,7 @@ Control9=IDC_LAYERCOLLISION_DESTRUCT_FLOOR,button,1342242816
Control10=IDC_LAYERCOLLISION_MOVE_LEFT,button,1342242816 Control10=IDC_LAYERCOLLISION_MOVE_LEFT,button,1342242816
Control11=IDC_LAYERCOLLISION_MOVE_RIGHT,button,1342242816 Control11=IDC_LAYERCOLLISION_MOVE_RIGHT,button,1342242816
Control12=IDC_LAYERCOLLISION_DEATH_INSTANT,button,1342242816 Control12=IDC_LAYERCOLLISION_DEATH_INSTANT,button,1342242816
Control13=IDC_LAYERCOLLISION_SOAK_UP,button,1342242816
[DLG:IDD_LAYER_FX] [DLG:IDD_LAYER_FX]
Type=1 Type=1

1
Utils/MapEdit/MapEdit.rc
View File

@ -680,6 +680,7 @@ BEGIN
PUSHBUTTON "Move Right",IDC_LAYERCOLLISION_MOVE_RIGHT,50,15,50,10 PUSHBUTTON "Move Right",IDC_LAYERCOLLISION_MOVE_RIGHT,50,15,50,10
PUSHBUTTON "Death Instant",IDC_LAYERCOLLISION_DEATH_INSTANT,100,40, PUSHBUTTON "Death Instant",IDC_LAYERCOLLISION_DEATH_INSTANT,100,40,
50,10 50,10
PUSHBUTTON "Soak Up",IDC_LAYERCOLLISION_SOAK_UP,100,15,50,10
END END
IDD_ELEMLIST DIALOG DISCARDABLE 0, 0, 156, 26 IDD_ELEMLIST DIALOG DISCARDABLE 0, 0, 156, 26

1
Utils/MapEdit/resource.h
View File

@ -100,6 +100,7 @@
#define IDC_LAYERSHADE_GFXG0 1092 #define IDC_LAYERSHADE_GFXG0 1092
#define IDC_LAYERCOLLISION_DEATH_INSTANT 1092 #define IDC_LAYERCOLLISION_DEATH_INSTANT 1092
#define IDC_LAYERSHADE_GFXB0 1093 #define IDC_LAYERSHADE_GFXB0 1093
#define IDC_LAYERCOLLISION_SOAK_UP 1093
#define IDC_ACTOR_PLAYER 1094 #define IDC_ACTOR_PLAYER 1094
#define IDC_LAYERSHADE_GFXR1 1094 #define IDC_LAYERSHADE_GFXR1 1094
#define IDC_LAYERSHADE_GFXG1 1095 #define IDC_LAYERSHADE_GFXG1 1095