diff --git a/src/menu.c b/src/menu.c
index 7286a45375a11e4a271996357ad3b9150b93f9d6..5ef147852491e60e777abb2932f2ee8438293129 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
-/*
- Copyright (C) Prikol Software 1996-1997
- Copyright (C) Aleksey Volynskov 1996-1997
- Copyright (C) <ARembo@gmail.com> 2011
-
- This file is part of the Doom2D:Rembo project.
-
- Doom2D:Rembo is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
-
- Doom2D:Rembo is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, see <http://www.gnu.org/licenses/> or
- write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+/* Copyright (C) 2020 SovietPony
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License ONLY.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
#include "glob.h"
#include "files.h"
return GM_popall();
}
-static int new_game_menu_handler (menu_msg_t *msg, const menu_t *m, void *data, int i) {
+static int new_game_menu_handler (menu_msg_t *msg, const menu_t *m, int i) {
static int cur;
enum { ONEPLAYER, TWOPLAYERS, DEATHMATCH, __NUM__ };
static const simple_menu_t sm = {
@@ -184,11 +177,7 @@ static int new_game_menu_handler (menu_msg_t *msg, const menu_t *m, void *data,
return simple_menu_handler(msg, i, __NUM__, &sm, &cur);
}
-static const menu_t new_game_menu = {
- NULL, &new_game_menu_handler
-};
-
-static int load_game_menu_handler (menu_msg_t *msg, const menu_t *m, void *data, int i) {
+static int load_game_menu_handler (menu_msg_t *msg, const menu_t *m, int i) {
static int cur;
const int max_slots = 7;
assert(i >= 0 && i < max_slots);
@@ -206,11 +195,7 @@ static int load_game_menu_handler (menu_msg_t *msg, const menu_t *m, void *data,
return basic_menu_handler(msg, GM_BIG, "Load game", "_OLDGAME", max_slots, &cur);
}
-static const menu_t load_game_menu = {
- NULL, &load_game_menu_handler
-};
-
-static int save_game_menu_handler (menu_msg_t *msg, const menu_t *m, void *data, int i) {
+static int save_game_menu_handler (menu_msg_t *msg, const menu_t *m, int i) {
static int cur;
const int max_slots = 7;
assert(i >= 0 && i < max_slots);
@@ -234,11 +219,7 @@ static int save_game_menu_handler (menu_msg_t *msg, const menu_t *m, void *data,
return basic_menu_handler(msg, GM_BIG, "Save game", "_SAVGAME", max_slots, &cur);
}
-static const menu_t save_game_menu = {
- NULL, &save_game_menu_handler
-};
-
-static int options_menu_handler (menu_msg_t *msg, const menu_t *m, void *data, int i) {
+static int options_menu_handler (menu_msg_t *msg, const menu_t *m, int i) {
static int cur;
const menu_t *mm;
enum { VIDEO, SOUND, MUSIC, __NUM__ };
@@ -264,11 +245,7 @@ static int options_menu_handler (menu_msg_t *msg, const menu_t *m, void *data, i
return simple_menu_handler(msg, i, __NUM__, &sm, &cur);
}
-static const menu_t options_menu = {
- NULL, &options_menu_handler
-};
-
-static int exit_menu_handler (menu_msg_t *msg, const menu_t *m, void *data, int i) {
+static int exit_menu_handler (menu_msg_t *msg, const menu_t *m, int i) {
static int cur;
enum { YES, NO, __NUM__ };
static const simple_menu_t sm = {
@@ -296,30 +273,31 @@ static int exit_menu_handler (menu_msg_t *msg, const menu_t *m, void *data, int
return simple_menu_handler(msg, i, __NUM__, &sm, &cur);
}
-static const menu_t exit_menu = {
- NULL, &exit_menu_handler
-};
-
-static int main_menu_handler (menu_msg_t *msg, const menu_t *m, void *data, int i) {
- static int cur;
+static int main_menu_handler (menu_msg_t *msg, const menu_t *m, int i) {
enum { NEWGAME, OLDGAME, SAVEGAME, OPTIONS, EXIT, __NUM__ };
assert(i >= 0 && i < __NUM__);
+ static int cur;
+ static const menu_t hm[__NUM__] = {
+ { new_game_menu_handler },
+ { load_game_menu_handler },
+ { save_game_menu_handler },
+ { options_menu_handler},
+ { exit_menu_handler }
+ };
static const simple_menu_t sm = {
GM_BIG, "Menu", NULL,
{
- { "New Game", &new_game_menu },
- { "Load Game", &load_game_menu },
- { "Save Game", &save_game_menu },
- { "Options", &options_menu },
- { "Exit", &exit_menu },
+ { "New Game", &hm[NEWGAME] },
+ { "Load Game", &hm[OLDGAME] },
+ { "Save Game", &hm[SAVEGAME] },
+ { "Options", &hm[OPTIONS] },
+ { "Exit", &hm[EXIT] }
}
};
return simple_menu_handler(msg, i, __NUM__, &sm, &cur);
}
-static const menu_t main_menu = {
- NULL, &main_menu_handler
-};
+static const menu_t main_menu = { &main_menu_handler };
int GM_push (const menu_t *m) {
assert(m != NULL);
assert(msg != NULL);
if (m->handler != NULL) {
GM_normalize_message(msg);
- return m->handler(msg, m, m->data, 0);
+ return m->handler(msg, m, 0);
}
return 0;
}
assert(msg != NULL);
if (m->handler != NULL) {
GM_normalize_message(msg);
- return m->handler(msg, m, m->data, i);
+ return m->handler(msg, m, i);
}
return 0;
}
Z_sound(msnd2, 128);
} else {
msg.type = GM_SELECT;
- if (cur < 0) abort();
if (GM_send(m, cur, &msg)) {
Z_sound(msnd2, 128);
}