1 files changed, 10 insertions, 17 deletions

diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index 300a762e76..061c90e18c 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -31,8 +31,7 @@
 
 namespace Sci {
 
-reg_t
-kAddMenu(EngineState *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kAddMenu(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	char *name = kernel_dereference_char_pointer(s, argv[0], 0);
 	char *contents = kernel_dereference_char_pointer(s, argv[1], 0);
 
@@ -44,8 +43,7 @@ kAddMenu(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 }
 
 
-reg_t
-kSetMenu(EngineState *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kSetMenu(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	int index = UKPV(0);
 	int i = 2;
 
@@ -57,16 +55,14 @@ kSetMenu(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	return s->r_acc;
 }
 
-reg_t
-kGetMenu(EngineState *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kGetMenu(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	int index = UKPV(0);
 
 	return menubar_get_attribute(s, (index >> 8) - 1, (index & 0xff) - 1, UKPV(1));
 }
 
 
-reg_t
-kDrawStatus(EngineState *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDrawStatus(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	reg_t text = argv[0];
 	int fgcolor = SKPV_OR_ALT(1, s->status_bar_foreground);
 	int bgcolor = SKPV_OR_ALT(2, s->status_bar_background);
@@ -95,8 +91,7 @@ kDrawStatus(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 }
 
 
-reg_t
-kDrawMenuBar(EngineState *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDrawMenuBar(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 
 	if (SKPV(0))
 		sciw_set_menubar(s, s->titlebar_port, s->menubar, -1);
@@ -204,8 +199,7 @@ static struct {
 };
 
 
-void
-about_freesci(EngineState *s) {
+void about_freesci(EngineState *s) {
 	int page;
 	gfxw_port_t *port;
 	int bodyfont, titlefont;
@@ -288,8 +282,7 @@ about_freesci(EngineState *s) {
 }
 
 
-static inline int
-_menu_go_down(EngineState *s, int menu_nr, int item_nr) {
+static int _menu_go_down(EngineState *s, int menu_nr, int item_nr) {
 	int seeker, max = s->menubar->menus[menu_nr].items_nr;
 	seeker = item_nr + 1;
 
@@ -298,7 +291,8 @@ _menu_go_down(EngineState *s, int menu_nr, int item_nr) {
 
 	if (seeker != max)
 		return seeker;
-	else return item_nr;
+	else
+		return item_nr;
 }
 
 #define FULL_REDRAW \
@@ -306,8 +300,7 @@ _menu_go_down(EngineState *s, int menu_nr, int item_nr) {
 	gfxop_update(s->gfx_state);
 
 
-reg_t
-kMenuSelect(EngineState *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kMenuSelect(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	reg_t event = argv[0];
 	/*int pause_sound = UKPV_OR_ALT(1, 1);*/ /* FIXME: Do this eventually */
 	int claimed = 0;