-Fix: fix GUI_Widget_Viewport_RedrawMap() prototype

use Screen enum instead of uint16
OpenDUNE · Jan 3, 2017 · 837c089 · 837c089
1 parent b7e0085
commit 837c089
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/gui/viewport.c b/src/gui/viewport.c
@@ -926,9 +926,9 @@ void GUI_Widget_Viewport_DrawTile(uint16 packed)
 /**
  * Redraw the whole map.
  *
- * @param screenID To which screen we should draw the map. Can only be 0 or 2. Any non-zero is forced to 2.
+ * @param screenID To which screen we should draw the map. Can only be SCREEN_0 or SCREEN_1. Any non-zero is forced to SCREEN_1.
  */
-void GUI_Widget_Viewport_RedrawMap(uint16 screenID)
+void GUI_Widget_Viewport_RedrawMap(Screen screenID)
 {
 	Screen oldScreenID = SCREEN_1;
 	uint16 i;

diff --git a/src/gui/widget.h b/src/gui/widget.h
@@ -3,6 +3,8 @@
 #ifndef GUI_WIDGET_H
 #define GUI_WIDGET_H
 
+#include "../gfx.h"
+
 /**
  * Types of WidgetClick available in the game.
  */
@@ -234,7 +236,7 @@ extern void Widget_PaintCurrentWidget(void);
 extern bool GUI_Widget_Viewport_Click(Widget *w);
 extern void GUI_Widget_Viewport_Draw(bool forceRedraw, bool hasScrolled, bool drawToMainScreen);
 extern void GUI_Widget_Viewport_DrawTile(uint16 packed);
-extern void GUI_Widget_Viewport_RedrawMap(uint16 screenID);
+extern void GUI_Widget_Viewport_RedrawMap(Screen screenID);
 
 /* widget_click.c */
 extern bool GUI_Widget_SpriteTextButton_Click(Widget *w);

diff --git a/src/house.c b/src/house.c
@@ -421,7 +421,7 @@ bool House_UpdateRadarState(House *h)
 
 	GUI_Mouse_Show_Safe();
 
-	GUI_Widget_Viewport_RedrawMap(0);
+	GUI_Widget_Viewport_RedrawMap(SCREEN_0);
 
 	return activate;
 }