diff --git a/src/display3d.c b/src/display3d.c index 514a036cc..621383e3d 100644 --- a/src/display3d.c +++ b/src/display3d.c @@ -2726,7 +2726,7 @@ static void drawDragBox( void ) pie_SetDepthBufferStatus(DEPTH_CMP_ALWAYS_WRT_OFF); iV_Box(minX, minY, maxX, maxY, WZCOL_UNIT_SELECT_BORDER); - pie_UniTransBoxFill(minX + 1, minY + 1, maxX - 1, maxY - 1, WZCOL_UNIT_SELECT_BOX); + pie_UniTransBoxFill(minX + 1, minY, maxX, maxY - 1, WZCOL_UNIT_SELECT_BOX); pie_SetDepthBufferStatus(DEPTH_CMP_LEQ_WRT_ON); } } diff --git a/src/hci.c b/src/hci.c index 98fdc57f1..7740f79ae 100644 --- a/src/hci.c +++ b/src/hci.c @@ -108,13 +108,13 @@ typedef struct { } BUTOFFSET; BUTOFFSET ReticuleOffsets[NUMRETBUTS] = { // Reticule button form relative positions. - {48,49}, // RETBUT_CANCEL, - {53,17}, // RETBUT_FACTORY, - {87,35}, // RETBUT_RESEARCH, - {87,70}, // RETBUT_BUILD, - {53,88}, // RETBUT_DESIGN, - {19,70}, // RETBUT_INTELMAP, - {19,35}, // RETBUT_COMMAND, + {48,47}, // RETBUT_CANCEL, + {53,15}, // RETBUT_FACTORY, + {87,33}, // RETBUT_RESEARCH, + {87,68}, // RETBUT_BUILD, + {53,86}, // RETBUT_DESIGN, + {19,68}, // RETBUT_INTELMAP, + {19,33}, // RETBUT_COMMAND, }; BUTSTATE ReticuleEnabled[NUMRETBUTS] = { // Reticule button enable states. diff --git a/src/hci.h b/src/hci.h index 6a8257fe2..dd1e23d2b 100644 --- a/src/hci.h +++ b/src/hci.h @@ -115,7 +115,7 @@ extern "C" #define IDSTAT_ALLYEND 4900 // Reticule position. -#define RET_X 23 +#define RET_X 24 #define RET_Y (324+E_H) #define RET_FORMWIDTH 132 #define RET_FORMHEIGHT 132 diff --git a/src/radar.c b/src/radar.c index dfe619cc6..cb789b429 100644 --- a/src/radar.c +++ b/src/radar.c @@ -264,19 +264,19 @@ void drawRadar(void) DrawNorth(); } // draw the box at the dimensions of the map - iV_TransBoxFill(-radarWidth/2.0, - -radarHeight/2.0, + iV_TransBoxFill(-radarWidth/2.0 - 1, + -radarHeight/2.0 - 1, radarWidth/2.0, radarHeight/2.0); - pie_RenderRadar(-radarWidth/2.0, - -radarHeight/2.0, + pie_RenderRadar(-radarWidth/2.0 - 1, + -radarHeight/2.0 - 1, radarWidth, radarHeight); pie_MatBegin(); pie_TRANSLATE(-radarWidth/2 - 1, -radarHeight/2 - 1, 0); DrawRadarExtras(0, 0, pixSizeH, pixSizeV); pie_MatEnd(); - drawRadarBlips(-radarWidth/2.0, -radarHeight/2.0, pixSizeH, pixSizeV); + drawRadarBlips(-radarWidth/2.0 - 1, -radarHeight/2.0 - 1, pixSizeH, pixSizeV); pie_MatEnd(); }