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

- addon to ch78, remove cursor and add any mouse click for exit from MAPUTILITY (radarmap) screen, also fix creation of radarmap without roofs.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6658 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Kriplo
2013-11-27 22:06:07 +00:00
parent f0c6b73e24
commit e6e8cd75fd
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/editscreen.cpp
+6 -1
View File
@@ -2309,8 +2309,13 @@ UINT32 PerformSelectedAction( void )
} }
break; break;
case ACTION_RADAR_MAP://dnl ch9 071009 case ACTION_RADAR_MAP://dnl ch9 071009 //dnl ch78 271113
ScreenMsg(FONT_MCOLOR_WHITE, MSG_INTERFACE, pPerformSelectedActionText[0], gubFilename); ScreenMsg(FONT_MCOLOR_WHITE, MSG_INTERFACE, pPerformSelectedActionText[0], gubFilename);
fBuildingShowRoofs = TRUE;
UpdateRoofsView();
fBuildingShowWalls = TRUE;
UpdateWallsView();
fBuildingShowRoomInfo = FALSE;
MarkWorldDirty(); MarkWorldDirty();
return(MAPUTILITY_SCREEN); return(MAPUTILITY_SCREEN);
break; break;
Utils/MapUtility.cpp
+3 -1
View File
@@ -24,6 +24,7 @@
//dnl ch77 131113 //dnl ch77 131113
#include "Editor Taskbar Utils.h" #include "Editor Taskbar Utils.h"
#include "Text Input.h" #include "Text Input.h"
#include "Cursor Control.h"//dnl ch78 271113
#define MINIMAP_X_SIZE 88//RADAR_WINDOW_WIDTH #define MINIMAP_X_SIZE 88//RADAR_WINDOW_WIDTH
#define MINIMAP_Y_SIZE 44//RADAR_WINDOW_HEIGHT #define MINIMAP_Y_SIZE 44//RADAR_WINDOW_HEIGHT
@@ -128,7 +129,7 @@ UINT32 MapUtilScreenHandle(void)
INT32 cnt, iX, iY, iSubX1, iSubY1, iSubX2, iSubY2, iWindowX, iWindowY, iCount; INT32 cnt, iX, iY, iSubX1, iSubY1, iSubX2, iSubY2, iWindowX, iWindowY, iCount;
FLOAT dX, dY, dStartX, dStartY; FLOAT dX, dY, dStartX, dStartY;
while(DequeueSpecificEvent(&InputEvent, KEY_DOWN|KEY_UP|KEY_REPEAT) == TRUE) while(DequeueSpecificEvent(&InputEvent, KEY_DOWN|KEY_UP|KEY_REPEAT) == TRUE || ((_LeftButtonDown|_RightButtonDown|_MiddleButtonDown) ? InputEvent.usParam = ESC : 0))//dnl ch78 271113
{ {
if(InputEvent.usParam == ESC) if(InputEvent.usParam == ESC)
{ {
@@ -152,6 +153,7 @@ UINT32 MapUtilScreenHandle(void)
if(gfMapUtilityWindowActive) if(gfMapUtilityWindowActive)
{ {
GetVideoSurface(&ghVSurface, gui8BitMiniMap); GetVideoSurface(&ghVSurface, gui8BitMiniMap);
SetCurrentCursorFromDatabase(VIDEO_NO_CURSOR);//dnl ch78 271113
return(MAPUTILITY_SCREEN); return(MAPUTILITY_SCREEN);
} }
else else