From 276a051904f73f269de71ca8c10530209df28174 Mon Sep 17 00:00:00 2001 From: Andrew Livy Date: Tue, 7 Oct 2003 17:57:52 +0000 Subject: [PATCH] Barebones Pop'n Music Theme / Noteskin --- stepmania/src/GameManager.cpp | 157 +++++++++++++++++++++----- stepmania/src/ScreenDemonstration.cpp | 1 + stepmania/src/ScreenHowToPlay.cpp | 1 + 3 files changed, 133 insertions(+), 26 deletions(-) diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index 160ae1eb00..c854e0e52a 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -35,7 +35,7 @@ const int BM_COL_SPACING=34; const int MANIAX_COL_SPACING = 36; const int TECHNO_COL_SPACING = 64; const int PNM5_COL_SPACING = 46; -const int PNM9_COL_SPACING = 46; +const int PNM9_COL_SPACING = 39; struct { char *name; @@ -822,6 +822,111 @@ GameDef g_GameDefs[NUM_GAMES] = }, } }, + { // GAME_PNM + "pnm", // m_szName + "Pop'n Music", // m_szDescription + 1, // m_iNumControllers + NUM_PNM_BUTTONS, // m_iButtonsPerController + { // m_szButtonNames + "Left White", + "Left Yellow", + "Left Green", + "Left Blue", + "Red", + "Right Blue", + "Right Green", + "Right Yellow", + "Right White", + "Back", + "Start", + "MenuLeft", + "MenuRight", + "MenuUp", + "MenuDown", + "Insert Coin", + "Operator", + }, + { // m_szSecondaryFunction + "", + "(MenuUp)", + "", + "(MenuLeft)", + "", + "(MenuRight)", + "", + "(MenuDown)", + "", + "(dedicated)", + "(dedicated)", + "(dedicated)", + "(dedicated)", + "(dedicated)", + "(dedicated)", + "(dedicated)", + "", + "", + }, + { // m_DedicatedMenuButton + PNM_BUTTON_MENULEFT, // MENU_BUTTON_LEFT + PNM_BUTTON_MENURIGHT, // MENU_BUTTON_RIGHT + PNM_BUTTON_MENUUP, // MENU_BUTTON_UP + PNM_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN + PNM_BUTTON_START, // MENU_BUTTON_START + PNM_BUTTON_BACK, // MENU_BUTTON_BACK + PNM_BUTTON_COIN, // MENU_BUTTON_COIN + PNM_BUTTON_OPERATOR // MENU_BUTTON_OPERATOR + }, + { // m_SecondaryMenuButton + PNM_BUTTON_LEFT_BLUE, + PNM_BUTTON_RIGHT_BLUE, + PNM_BUTTON_LEFT_YELLOW, + PNM_BUTTON_RIGHT_YELLOW, + PNM_BUTTON_RED, + PNM_BUTTON_BACK, + PNM_BUTTON_COIN, // MENU_BUTTON_COIN + PNM_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR + }, + { // m_iDefaultKeyboardKey + { // PLAYER_1 + SDLK_z, // PNM_BUTTON_LEFT_WHITE, + SDLK_s, // PNM_BUTTON_LEFT_YELLOW, + SDLK_x, // PNM_BUTTON_LEFT_GREEN, + SDLK_d, // PNM_BUTTON_LEFT_BLUE, + SDLK_c, // PNM_BUTTON_RED, + SDLK_f, // PNM_BUTTON_RIGHT_BLUE, + SDLK_v, // PNM_BUTTON_RIGHT_GREEN, + SDLK_g, // PNM_BUTTON_RIGHT_YELLOW, + SDLK_b, // PNM_BUTTON_RIGHT_WHITE, + SDLK_RETURN, // PNM_BUTTON_MENUSTART + SDLK_ESCAPE, // PNM_BUTTON_MENUBACK + SDLK_LEFT, // PNM_BUTTON_MENULEFT, + SDLK_RIGHT, // PNM_BUTTON_MENURIGHT, + SDLK_UP, // PNM_BUTTON_MENUUP + SDLK_DOWN, // PNM_BUTTON_MENUDOWN + SDLK_F1, // PNM_BUTTON_COIN + SDLK_SCROLLOCK // PNM_BUTTON_OPERATOR + }, + { // PLAYER_2 + -1, // BM_BUTTON_KEY1, + -1, // BM_BUTTON_KEY2, + -1, // BM_BUTTON_KEY3, + -1, // BM_BUTTON_KEY4, + -1, // BM_BUTTON_KEY5, + -1, // BM_BUTTON_KEY6, + -1, // BM_BUTTON_KEY7, + -1, // BM_BUTTON_SCRATCHUP, + -1, // BM_BUTTON_SCRATCHDOWN, + -1, // BM_BUTTON_START, + -1, // BM_BUTTON_SELECT, + -1, // BM_BUTTON_MENULEFT + -1, // BM_BUTTON_MENURIGHT + -1, // BM_BUTTON_MENUUP + -1, // BM_BUTTON_MENUDOWN + -1, // BM_BUTTON_COIN + -1 // BM_BUTTON_OPERATOR + }, + } + }, }; StyleDef g_StyleDefs[NUM_STYLES] = @@ -1620,25 +1725,25 @@ StyleDef g_StyleDefs[NUM_STYLES] = 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_GREEN, -PNM5_COL_SPACING*1.5f }, - { TRACK_2, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_BLUE, -PNM5_COL_SPACING*0.5f }, + { TRACK_1, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_GREEN, -PNM5_COL_SPACING*2.0f }, + { TRACK_2, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_BLUE, -PNM5_COL_SPACING*1.0f }, { TRACK_3, GAME_CONTROLLER_1, PNM_BUTTON_RED, -PNM5_COL_SPACING*0.0f }, - { TRACK_4, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_BLUE, +PNM5_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_GREEN, +PNM5_COL_SPACING*1.5f }, + { TRACK_4, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_BLUE, +PNM5_COL_SPACING*1.0f }, + { TRACK_5, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_GREEN, +PNM5_COL_SPACING*2.0f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_GREEN, -PNM5_COL_SPACING*1.5f }, - { TRACK_2, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_BLUE, -PNM5_COL_SPACING*0.5f }, + { TRACK_1, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_GREEN, -PNM5_COL_SPACING*2.0f }, + { TRACK_2, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_BLUE, -PNM5_COL_SPACING*1.0f }, { TRACK_3, GAME_CONTROLLER_2, PNM_BUTTON_RED, -PNM5_COL_SPACING*0.0f }, - { TRACK_4, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_BLUE, +PNM5_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_GREEN, +PNM5_COL_SPACING*1.5f }, + { TRACK_4, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_BLUE, +PNM5_COL_SPACING*1.0f }, + { TRACK_5, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_GREEN, +PNM5_COL_SPACING*2.0f }, }, }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4 }, }, - { // STYLE_PNM_FIVE + { // STYLE_PNM_NINE GAME_PNM, // m_Game true, // m_bUsedForGameplay true, // m_bUsedForEdit @@ -1649,26 +1754,26 @@ StyleDef g_StyleDefs[NUM_STYLES] = 9, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_WHITE, -PNM9_COL_SPACING*3.5f }, - { TRACK_2, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_YELLOW, -PNM9_COL_SPACING*2.5f }, - { TRACK_3, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_GREEN, -PNM9_COL_SPACING*1.5f }, - { TRACK_4, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_BLUE, -PNM9_COL_SPACING*0.5f }, + { TRACK_1, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_WHITE, -PNM9_COL_SPACING*4.0f }, + { TRACK_2, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_YELLOW, -PNM9_COL_SPACING*3.0f }, + { TRACK_3, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_GREEN, -PNM9_COL_SPACING*2.0f }, + { TRACK_4, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_BLUE, -PNM9_COL_SPACING*1.0f }, { TRACK_5, GAME_CONTROLLER_1, PNM_BUTTON_RED, -PNM9_COL_SPACING*0.0f }, - { TRACK_6, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_BLUE, +PNM9_COL_SPACING*0.5f }, - { TRACK_7, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_GREEN, +PNM9_COL_SPACING*1.5f }, - { TRACK_8, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_YELLOW, +PNM9_COL_SPACING*2.5f }, - { TRACK_9, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_WHITE, +PNM9_COL_SPACING*3.5f }, + { TRACK_6, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_BLUE, +PNM9_COL_SPACING*1.0f }, + { TRACK_7, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_GREEN, +PNM9_COL_SPACING*2.0f }, + { TRACK_8, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_YELLOW, +PNM9_COL_SPACING*3.0f }, + { TRACK_9, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_WHITE, +PNM9_COL_SPACING*4.0f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_WHITE, -PNM9_COL_SPACING*3.5f }, - { TRACK_2, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_YELLOW, -PNM9_COL_SPACING*2.5f }, - { TRACK_3, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_GREEN, -PNM9_COL_SPACING*1.5f }, - { TRACK_4, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_BLUE, -PNM9_COL_SPACING*0.5f }, + { TRACK_1, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_WHITE, -PNM9_COL_SPACING*4.0f }, + { TRACK_2, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_YELLOW, -PNM9_COL_SPACING*3.0f }, + { TRACK_3, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_GREEN, -PNM9_COL_SPACING*2.0f }, + { TRACK_4, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_BLUE, -PNM9_COL_SPACING*1.0f }, { TRACK_5, GAME_CONTROLLER_2, PNM_BUTTON_RED, -PNM9_COL_SPACING*0.0f }, - { TRACK_6, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_BLUE, +PNM9_COL_SPACING*0.5f }, - { TRACK_7, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_GREEN, +PNM9_COL_SPACING*1.5f }, - { TRACK_8, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_YELLOW, +PNM9_COL_SPACING*2.5f }, - { TRACK_9, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_WHITE, +PNM9_COL_SPACING*3.5f }, + { TRACK_6, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_BLUE, +PNM9_COL_SPACING*1.0f }, + { TRACK_7, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_GREEN, +PNM9_COL_SPACING*2.0f }, + { TRACK_8, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_YELLOW, +PNM9_COL_SPACING*3.0f }, + { TRACK_9, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_WHITE, +PNM9_COL_SPACING*4.0f }, }, }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp index 9abf18ed13..8226198575 100644 --- a/stepmania/src/ScreenDemonstration.cpp +++ b/stepmania/src/ScreenDemonstration.cpp @@ -39,6 +39,7 @@ bool PrepareForDemonstration() // always return true. case GAME_DS3DDX: GAMESTATE->m_CurStyle = STYLE_DS3DDX_SINGLE; break; case GAME_BM: GAMESTATE->m_CurStyle = STYLE_BM_SINGLE; break; case GAME_MANIAX: GAMESTATE->m_CurStyle = STYLE_MANIAX_SINGLE; break; + case GAME_PNM: GAMESTATE->m_CurStyle = STYLE_PNM_NINE; break; default: ASSERT(0); } diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp index 523573aa5b..b6b7cb6b1f 100644 --- a/stepmania/src/ScreenHowToPlay.cpp +++ b/stepmania/src/ScreenHowToPlay.cpp @@ -144,6 +144,7 @@ ScreenHowToPlay::ScreenHowToPlay( CString sName ) : ScreenAttract( sName ) case GAME_DS3DDX: GAMESTATE->m_CurStyle = STYLE_DS3DDX_SINGLE; break; case GAME_BM: GAMESTATE->m_CurStyle = STYLE_BM_SINGLE; break; case GAME_MANIAX: GAMESTATE->m_CurStyle = STYLE_MANIAX_SINGLE; break; + case GAME_PNM: GAMESTATE->m_CurStyle = STYLE_PNM_NINE; break; default: ASSERT(0); // we should cover all gametypes.... }