From a46f8e333cf0d482143fc4a865ffc1efa6c46a9c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 10 Jul 2011 08:56:04 +0900
Subject: [PATCH] Convert prototypes to C-style for doxygen.

---
 ruamoko/cl_menu/controls_o.h   |  4 +--
 ruamoko/cl_menu/menu.h         | 45 +++++++++++++++++-----------------
 ruamoko/cl_menu/options.h      |  4 +--
 ruamoko/cl_menu/options_util.h | 10 ++++----
 ruamoko/cl_menu/servlist.h     |  2 +-
 5 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/ruamoko/cl_menu/controls_o.h b/ruamoko/cl_menu/controls_o.h
index b4dac59f6..3e8c340b1 100644
--- a/ruamoko/cl_menu/controls_o.h
+++ b/ruamoko/cl_menu/controls_o.h
@@ -1,7 +1,7 @@
 #ifndef __controls_o_h
 #define __controls_o_h
 
-@extern void () MENU_control_binding;
-@extern void () load_keybindings;
+@extern void MENU_control_binding (void);
+@extern void load_keybindings (void);
 
 #endif//__controls_o_h
diff --git a/ruamoko/cl_menu/menu.h b/ruamoko/cl_menu/menu.h
index e5d2326e2..5c8d48df3 100644
--- a/ruamoko/cl_menu/menu.h
+++ b/ruamoko/cl_menu/menu.h
@@ -1,28 +1,27 @@
 #ifndef __menu_h
 #define __menu_h
 
-@extern void (int x, int y, string text) Menu_Begin;
-@extern void (int val) Menu_FadeScreen;
-@extern void (int (int x, int y) func) Menu_Draw;
-@extern void (void () func) Menu_EnterHook;
-@extern void (void () func) Menu_LeaveHook;
-@extern void (int x, int y, string name) Menu_Pic;
-@extern void (int x, int y, string name, int srcx, int srcy,
-			  int width, int height) Menu_SubPic;
-@extern void (int x, int y, string name) Menu_CenterPic;
-@extern void (int x, int y, string name, int srcx, int srcy,
-			  int width, int height) Menu_CenterSubPic;
-@extern void (int x, int y, string text,
-			  int (string text, int key) func,
-			  int allkeys) Menu_Item;
-@extern void (void (int x, int y) func) Menu_Cursor;
-@extern void (int (int key, int unicode, int down)
-			  func) Menu_KeyEvent;
-@extern void () Menu_End;
-@extern void (string name) Menu_TopMenu;
-@extern void (string name) Menu_SelectMenu;
-@extern void (int () func) Menu_SetQuit;
-@extern void () Menu_Quit;
-@extern int () Menu_GetIndex;
+@extern void Menu_Begin (int x, int y, string text);
+@extern void Menu_FadeScreen (int val);
+@extern void Menu_Draw (int (func)(int x, int y));
+@extern void Menu_EnterHook (void (func)(void));
+@extern void Menu_LeaveHook (void (func)(void));
+@extern void Menu_Pic (int x, int y, string name);
+@extern void Menu_SubPic (int x, int y, string name, int srcx, int srcy,
+						  int width, int height);
+@extern void Menu_CenterPic (int x, int y, string name);
+@extern void Menu_CenterSubPic (int x, int y, string name, int srcx, int srcy,
+								int width, int height);
+@extern void Menu_Item (int x, int y, string text,
+						int (func)(string text, int key),
+						int allkeys);
+@extern void Menu_Cursor (void (func)(int x, int y));
+@extern void Menu_KeyEvent (int (func)(int key, int unicode, int down));
+@extern void Menu_End (void);
+@extern void Menu_TopMenu (string name);
+@extern void Menu_SelectMenu (string name);
+@extern void Menu_SetQuit (int (func)(void));
+@extern void Menu_Quit (void);
+@extern int  Menu_GetIndex (void);
 
 #endif//__menu_h;
diff --git a/ruamoko/cl_menu/options.h b/ruamoko/cl_menu/options.h
index 451c685de..bb4971d95 100644
--- a/ruamoko/cl_menu/options.h
+++ b/ruamoko/cl_menu/options.h
@@ -1,7 +1,7 @@
 #ifndef __options_h
 #define __options_h
 
-@extern void () MENU_options;
-@extern void (int x, int y, int spacing, string label, string valstr) draw_val_item;
+@extern void MENU_options (void);
+@extern void draw_val_item (int x, int y, int spacing, string label, string valstr);
 
 #endif//__options_r
diff --git a/ruamoko/cl_menu/options_util.h b/ruamoko/cl_menu/options_util.h
index 79d4aed47..18db97003 100644
--- a/ruamoko/cl_menu/options_util.h
+++ b/ruamoko/cl_menu/options_util.h
@@ -1,10 +1,10 @@
 #ifndef __options_util_h
 #define __options_util_h
 
-@extern void (int x, int y) opt_cursor;
-@extern void (int x, int y, int spacing, string spacechar, string label, string valstr) draw_item;
-@extern void (int x, int y, int spacing, string label, string valstr) draw_val_item;
-@extern int (float min, float max, float val) to_percentage;
-@extern float (float min, float max, float step, float val, int cntflag) min_max_cnt;
+@extern void opt_cursor (int x, int y);
+@extern void draw_item (int x, int y, int spacing, string spacechar, string label, string valstr);
+@extern void  draw_val_item (int x, int y, int spacing, string label, string valstr);
+@extern int to_percentage (float min, float max, float val);
+@extern float min_max_cnt (float min, float max, float step, float val, int cntflag);
 
 #endif//__options_util_h
diff --git a/ruamoko/cl_menu/servlist.h b/ruamoko/cl_menu/servlist.h
index 14aef4172..e49667e7f 100644
--- a/ruamoko/cl_menu/servlist.h
+++ b/ruamoko/cl_menu/servlist.h
@@ -1,6 +1,6 @@
 #ifndef __servlist_h
 #define __servlist_h
 
-@extern void () server_list_menu;
+@extern void server_list_menu (void);
 
 #endif//__servlist_h