edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-12 19:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #462 from gamertyp/master

Browse source 
Re-ordered the Gametiles-menu
This commit is contained in:
Dennis Felsing 2016-05-04 23:47:40 +02:00
parent 2df9c79483 b479dd412c
commit 01cad615a3
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/game/editor/layer_tiles.cpp
View file

@ -602,25 +602,25 @@ int CLayerTiles::RenderProperties(CUIRect *pToolBox)
switch(Result) switch(Result)
{ {
case 4: case 4:
Result = TILE_FREEZE; Result = TILE_THROUGH_CUT;
break; break;
case 5: case 5:
Result = TILE_UNFREEZE; Result = TILE_FREEZE;
break; break;
case 6: case 6:
Result = TILE_DFREEZE; Result = TILE_UNFREEZE;
break; break;
case 7: case 7:
Result = TILE_DUNFREEZE; Result = TILE_DFREEZE;
break; break;
case 8: case 8:
Result = TILE_TELECHECKIN; Result = TILE_DUNFREEZE;
break; break;
case 9: case 9:
Result = TILE_TELECHECKINEVIL; Result = TILE_TELECHECKIN;
break; break;
case 10: case 10:
Result = TILE_THROUGH_CUT; Result = TILE_TELECHECKINEVIL;
default: default:
break; break;
} }

2
src/game/editor/popups.cpp
View file

@ -1307,7 +1307,7 @@ static int s_GametileOpSelected = -1;
int CEditor::PopupSelectGametileOp(CEditor *pEditor, CUIRect View) int CEditor::PopupSelectGametileOp(CEditor *pEditor, CUIRect View)
{ {
static const char *s_pButtonNames[] = { "Clear", "Collision", "Death", "Unhookable", "Freeze", "Unfreeze", "Deep Freeze", "Deep Unfreeze", "Check-Tele From", "Evil Check-Tele From", "Hookthrough" }; static const char *s_pButtonNames[] = { "Clear", "Collision", "Death", "Unhookable", "Hookthrough", "Freeze", "Unfreeze", "Deep Freeze", "Deep Unfreeze", "Blue Check-Tele", "Red Check-Tele" };
static unsigned s_NumButtons = sizeof(s_pButtonNames) / sizeof(char*); static unsigned s_NumButtons = sizeof(s_pButtonNames) / sizeof(char*);
CUIRect Button; CUIRect Button;