1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes (by Buggler)

Browse Source 
- Map Editor: Added fasthelp text for map editor hotkeys
- Map Editor: Disabled key repeat in map editor due to double character entry in input box
- Fixed other minor hotkey/fasttext related issues

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5893 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-03-04 09:12:28 +00:00
parent 50c4982f91
commit ca20403bc4
12 changed files with 359 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/Editor Taskbar Creation.cpp
+11 -2
View File
@@ -453,14 +453,17 @@ void InitEditorBuildingsToolbar()
CreateTextButton(iEditorBuildingsToolbarText[0],(UINT16)SMALLCOMPFONT, FONT_YELLOW, FONT_BLACK, BUTTON_USE_DEFAULT,
iScreenWidthOffset + 110, 2 * iScreenHeightOffset + 400, 50, 15, BUTTON_TOGGLE,MSYS_PRIORITY_NORMAL,BUTTON_NO_CALLBACK,
BuildingToggleRoofViewCallback);
SetButtonFastHelpText(iEditorButton[BUILDING_TOGGLE_ROOF_VIEW],iEditorBuildingsToolbarText[29]);
iEditorButton[BUILDING_TOGGLE_WALL_VIEW] =
CreateTextButton(iEditorBuildingsToolbarText[1],(UINT16)SMALLCOMPFONT, FONT_YELLOW, FONT_BLACK, BUTTON_USE_DEFAULT,
iScreenWidthOffset + 110, 2 * iScreenHeightOffset + 415, 50, 15, BUTTON_TOGGLE,MSYS_PRIORITY_NORMAL,BUTTON_NO_CALLBACK,
BuildingToggleWallViewCallback);
SetButtonFastHelpText(iEditorButton[BUILDING_TOGGLE_WALL_VIEW],iEditorBuildingsToolbarText[30]);
iEditorButton[BUILDING_TOGGLE_INFO_VIEW] =
CreateTextButton(iEditorBuildingsToolbarText[2],(UINT16)SMALLCOMPFONT, FONT_YELLOW, FONT_BLACK, BUTTON_USE_DEFAULT,
iScreenWidthOffset + 110, 2 * iScreenHeightOffset + 430, 50, 15, BUTTON_TOGGLE,MSYS_PRIORITY_NORMAL,BUTTON_NO_CALLBACK,
BuildingToggleInfoViewCallback);
SetButtonFastHelpText(iEditorButton[BUILDING_TOGGLE_INFO_VIEW],iEditorBuildingsToolbarText[31]);
//Selection method buttons
iEditorButton[BUILDING_PLACE_WALLS] =
CreateEasyToggleButton( iScreenWidthOffset + 180,2 * iScreenHeightOffset + 370,"EDITOR//wall.sti", BuildingWallCallback);
@@ -775,11 +778,11 @@ void InitEditorTerrainToolbar()
SetButtonFastHelpText(iEditorButton[TERRAIN_CYCLE_BRUSHSIZE],iEditorTerrainToolbarText[11]);
iEditorButton[TERRAIN_RAISE_DENSITY] =
CreateEasyNoToggleButton( iScreenWidthOffset + 280,SCREEN_HEIGHT - 50,"EDITOR//uparrow.sti", BtnIncBrushDensityCallback);
CreateEasyNoToggleButton( iScreenWidthOffset + 350,SCREEN_HEIGHT - 50,"EDITOR//uparrow.sti", BtnIncBrushDensityCallback);
SetButtonFastHelpText(iEditorButton[TERRAIN_RAISE_DENSITY],iEditorTerrainToolbarText[12]);
iEditorButton[TERRAIN_LOWER_DENSITY] =
CreateEasyNoToggleButton( iScreenWidthOffset + 350,SCREEN_HEIGHT - 50,"EDITOR//downarrow.sti", BtnDecBrushDensityCallback);
CreateEasyNoToggleButton( iScreenWidthOffset + 280,SCREEN_HEIGHT - 50,"EDITOR//downarrow.sti", BtnDecBrushDensityCallback);
SetButtonFastHelpText(iEditorButton[TERRAIN_LOWER_DENSITY],iEditorTerrainToolbarText[13]);
}
@@ -791,31 +794,37 @@ void CreateEditorTaskbarInternal()
iScreenWidthOffset + 100, SCREEN_HEIGHT - 20, 90, 20, BUTTON_TOGGLE,MSYS_PRIORITY_HIGH,BUTTON_NO_CALLBACK,
TaskTerrainCallback);
SpecifyButtonDownTextColors( iEditorButton[TAB_TERRAIN], FONT_YELLOW, FONT_ORANGE );
SetButtonFastHelpText(iEditorButton[ TAB_TERRAIN ],iEditorTaskbarInternalText[6]);
iEditorButton[ TAB_BUILDINGS ] =
CreateTextButton(iEditorTaskbarInternalText[1], (UINT16)SMALLFONT1, FONT_LTKHAKI, FONT_DKKHAKI, BUTTON_USE_DEFAULT,
iScreenWidthOffset + 190, SCREEN_HEIGHT - 20, 90, 20, BUTTON_TOGGLE,MSYS_PRIORITY_HIGH,BUTTON_NO_CALLBACK,
TaskBuildingCallback);
SpecifyButtonDownTextColors( iEditorButton[TAB_BUILDINGS], FONT_YELLOW, FONT_ORANGE );
SetButtonFastHelpText(iEditorButton[ TAB_BUILDINGS ],iEditorTaskbarInternalText[7]);
iEditorButton[ TAB_ITEMS ] =
CreateTextButton(iEditorTaskbarInternalText[2], (UINT16)SMALLFONT1, FONT_LTKHAKI, FONT_DKKHAKI, BUTTON_USE_DEFAULT,
iScreenWidthOffset + 280, SCREEN_HEIGHT - 20, 90, 20, BUTTON_TOGGLE,MSYS_PRIORITY_HIGH,BUTTON_NO_CALLBACK,
TaskItemsCallback);
SpecifyButtonDownTextColors( iEditorButton[TAB_ITEMS], FONT_YELLOW, FONT_ORANGE );
SetButtonFastHelpText(iEditorButton[ TAB_ITEMS ],iEditorTaskbarInternalText[8]);
iEditorButton[ TAB_MERCS ] =
CreateTextButton(iEditorTaskbarInternalText[3], (UINT16)SMALLFONT1, FONT_LTKHAKI, FONT_DKKHAKI, BUTTON_USE_DEFAULT,
iScreenWidthOffset + 370, SCREEN_HEIGHT - 20, 90, 20, BUTTON_TOGGLE,MSYS_PRIORITY_HIGH,BUTTON_NO_CALLBACK,
TaskMercsCallback);
SpecifyButtonDownTextColors( iEditorButton[TAB_MERCS], FONT_YELLOW, FONT_ORANGE );
SetButtonFastHelpText(iEditorButton[ TAB_MERCS ],iEditorTaskbarInternalText[9]);
iEditorButton[ TAB_MAPINFO ] =
CreateTextButton(iEditorTaskbarInternalText[4], (UINT16)SMALLFONT1, FONT_LTKHAKI, FONT_DKKHAKI, BUTTON_USE_DEFAULT,
iScreenWidthOffset + 460, SCREEN_HEIGHT - 20, 90, 20, BUTTON_TOGGLE,MSYS_PRIORITY_HIGH,BUTTON_NO_CALLBACK,
TaskMapInfoCallback);
SpecifyButtonDownTextColors( iEditorButton[TAB_MAPINFO], FONT_YELLOW, FONT_ORANGE );
SetButtonFastHelpText(iEditorButton[ TAB_MAPINFO ],iEditorTaskbarInternalText[10]);
iEditorButton[ TAB_OPTIONS ] =
CreateTextButton(iEditorTaskbarInternalText[5], (UINT16)SMALLFONT1, FONT_LTKHAKI, FONT_DKKHAKI, BUTTON_USE_DEFAULT,
iScreenWidthOffset + 550, SCREEN_HEIGHT - 20, 90, 20, BUTTON_TOGGLE,MSYS_PRIORITY_HIGH,BUTTON_NO_CALLBACK,
TaskOptionsCallback);
SpecifyButtonDownTextColors( iEditorButton[TAB_OPTIONS], FONT_YELLOW, FONT_ORANGE );
SetButtonFastHelpText(iEditorButton[ TAB_OPTIONS ],iEditorTaskbarInternalText[11]);
//Create the buttons within each tab.
InitEditorTerrainToolbar();
Editor/Editor Taskbar Utils.cpp
+2 -2
View File
@@ -892,8 +892,8 @@ void RenderEditorInfo( )
//dnl ch52 091009
SetFont(FONT12ARIAL);
SetFontShadow(NO_SHADOW);
SetFontForeground(FONT_BLACK);
SetFontShadow(FONT_NEARBLACK);
SetFontForeground(FONT_GRAY2);
SetFontBackground(FONT_BLACK);
//dnl ch1 101009 Display the mapindex position
Editor/editscreen.cpp
+40 -16
View File
@@ -1553,6 +1553,10 @@ void HandleKeyboardShortcuts( )
break;
case F1:
/*
//Buggler: help screen not in used due to space limitations
iCurrentAction = ACTION_HELPSCREEN;
*/
gfRenderWorld = TRUE;
gfRenderTaskbar = TRUE;
break;
@@ -1635,11 +1639,11 @@ void HandleKeyboardShortcuts( )
break;
case '[':
iCurrentAction = ACTION_DENSITY_DOWN;
iEditorToolbarState = TBAR_MODE_DENS_DWN;
break;
case ']':
iCurrentAction = ACTION_DENSITY_UP;
iEditorToolbarState = TBAR_MODE_DENS_UP;
break;
case '+':
@@ -1708,6 +1712,17 @@ void HandleKeyboardShortcuts( )
{
iCurrentAction = ACTION_COPY_MERC_PLACEMENT;
}
else
{
if( iCurrentTaskbar != TASK_TERRAIN )
{
iTaskMode = TASK_TERRAIN;
DoTaskbar();
}
iCurrentAction = ACTION_NULL;
SetEditorTerrainTaskbarMode( TERRAIN_PLACE_CLIFFS );
}
break;
case 'C'://dnl ch7 210909 Clicked Placement Switch
if(fDontUseClick)
@@ -1729,10 +1744,7 @@ void HandleKeyboardShortcuts( )
}
iCurrentAction = ACTION_NULL;
iDrawMode = DRAW_MODE_DEBRIS;
ClickEditorButton( TERRAIN_PLACE_DEBRIS );
iEditorToolbarState = TBAR_MODE_DRAW_DEBRIS;
TerrainTileDrawMode = TERRAIN_TILES_NODRAW;
SetEditorTerrainTaskbarMode( TERRAIN_PLACE_DEBRIS );
break;
case 'e':
if ( iDrawMode >= DRAW_MODE_ERASE )
@@ -1864,6 +1876,12 @@ void HandleKeyboardShortcuts( )
break;
#endif
case 'n':
if (EditorInputEvent.usKeyState & CTRL_DOWN )
{
UpdateLastActionBeforeLeaving();
iCurrentAction = ACTION_NEW_MAP;
break;
}
if( fBuildingShowRoomInfo ^= 1 )
{
SetRenderFlags( RENDER_FLAG_ROOMIDS );
@@ -1882,9 +1900,17 @@ void HandleKeyboardShortcuts( )
DoTaskbar();
}
iCurrentAction = ACTION_NULL;
iDrawMode = DRAW_MODE_OSTRUCTS2;
ClickEditorButton( TERRAIN_PLACE_MISC );
iEditorToolbarState = TBAR_MODE_DRAW_OSTRUCTS2;
SetEditorTerrainTaskbarMode( TERRAIN_PLACE_MISC );
break;
case 'p': // roads
if( iCurrentTaskbar != TASK_TERRAIN )
{
iTaskMode = TASK_TERRAIN;
DoTaskbar();
}
iCurrentAction = ACTION_NULL;
SetEditorTerrainTaskbarMode( TERRAIN_PLACE_ROADS );
break;
case 'r': // rocks
if ( iCurrentTaskbar != TASK_TERRAIN )
@@ -1893,9 +1919,7 @@ void HandleKeyboardShortcuts( )
DoTaskbar();
}
iCurrentAction = ACTION_NULL;
iDrawMode = DRAW_MODE_OSTRUCTS1;
ClickEditorButton( TERRAIN_PLACE_ROCKS );
iEditorToolbarState = TBAR_MODE_DRAW_OSTRUCTS1;
SetEditorTerrainTaskbarMode( TERRAIN_PLACE_ROCKS );
break;
case 'R'://dnl ch8 210909 Random Placement Switch
if(fDontUseRandom)
@@ -1922,9 +1946,7 @@ void HandleKeyboardShortcuts( )
DoTaskbar();
}
iCurrentAction = ACTION_NULL;
iDrawMode = DRAW_MODE_OSTRUCTS;
ClickEditorButton( TERRAIN_PLACE_TREES );
iEditorToolbarState = TBAR_MODE_DRAW_OSTRUCTS;
SetEditorTerrainTaskbarMode( TERRAIN_PLACE_TREES );
break;
case 'T':
if ( fShowTrees )
@@ -2088,7 +2110,8 @@ void HandleKeyboardShortcuts( )
iCurrentAction = ACTION_NULL;
break;
}
}
}
/* //Buggler: Commented out specific keys repeating function as it will result in double character entry in input box
else if ( !HandleSummaryInput( &EditorInputEvent ) && !HandleTextInput( &EditorInputEvent ) && EditorInputEvent.usEvent == KEY_REPEAT )
{
switch( EditorInputEvent.usParam )
@@ -2163,6 +2186,7 @@ void HandleKeyboardShortcuts( )
break;
}
}
*/
}
}