Merged from revision: 7678

Editor Fixes (by Buggler):
- '~' (tilde) hotkey to toggle level cursor if applicable; CTRL hotkey for placing objects on roof removed 
- Fixed missing roof cursor for non-vanilla size maps
- Updated editor popup text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-12-09 15:57:15 +00:00
parent eaa153b310
commit eebb57ed38
12 changed files with 55 additions and 27 deletions
+4 -4
View File
@@ -55,7 +55,7 @@ UINT16 CurrentStruct = NO_TILE;
UINT32 gDoBanks = NO_BANKS;
UINT32 gDoCliffs = NO_CLIFFS;
extern BOOLEAN FlatRoofAboveGridNo( INT32 iMapIndex );
//---------------------------------------------------------------------------------------------------------------
// QuickEraseMapTile
@@ -255,7 +255,7 @@ void PasteDebris( INT32 iMapIndex )
AddToUndoList( iMapIndex );
// anv: add anything on the roof, cause why not
if ( _KeyDown(17) )
if ( ( gfRoofPlacement && FlatRoofAboveGridNo( iMapIndex ) ) )
{
// Add debris to the world
usUseIndex = pSelList[ iCurBank ].usIndex;
@@ -395,7 +395,7 @@ void PasteSingleWallCommon( INT32 iMapIndex )
usUseObjIndex = (UINT16)pSelList[ iCurBank ].uiObject;
// TEMP STUFF FOR ONROOF THINGS!
if ( ( (usUseObjIndex >= FIRSTONROOF) && (usUseObjIndex <= SECONDONROOF ) ) || _KeyDown(17) )
if ( ( (usUseObjIndex >= FIRSTONROOF) && (usUseObjIndex <= SECONDONROOF ) ) || ( gfRoofPlacement && FlatRoofAboveGridNo( iMapIndex ) ) )
{
// WANNE: Disabled the next line, because if makes placing sandbags on rooftops impossible!
//dnl Remove all onroof things before placing new one to avoid stacking problems of same element
@@ -602,7 +602,7 @@ void PasteStructureCommon( INT32 iMapIndex )
*/
// anv: add anything on the roof, cause why not
if ( _KeyDown(17) )
if ( ( gfRoofPlacement && FlatRoofAboveGridNo( iMapIndex ) ) )
{
if ( /*fDoPaste &&*/ iMapIndex < 0x80000000 )
{