cvs diff CommonMetrics.h GameConstantsAndTypes.h GameInput.h GameManager.cpp InputQueue.cpp OptionsCursor.cpp PlayerNumber.cpp PlayerNumber.h ProductInfo.h ProductInfo.inc ScreenGameplay.cpp StepMania.cpp StepMania.dsp (in directory c:\stepmania\stepmania\src\)
Index: CommonMetrics.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/CommonMetrics.h,v
retrieving revision 1.1
diff -r1.1 CommonMetrics.h
13a14,15
> #define COLOR_P3					THEME->GetMetricC("Common","ColorP3")
> #define COLOR_P4					THEME->GetMetricC("Common","ColorP4")
Index: GameConstantsAndTypes.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/GameConstantsAndTypes.h,v
retrieving revision 1.133
diff -r1.133 GameConstantsAndTypes.h
93a94
> 	STEPS_TYPE_DANCE_QUAD,
Index: GameManager.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/GameManager.cpp,v
retrieving revision 1.134
diff -r1.134 GameManager.cpp
1270a1271,1313
> 	{	// STYLE_DANCE_QUAD
> 		&g_Games[GAME_DANCE],				// m_Game
> 		true,									// m_bUsedForGameplay
> 		false,									// m_bUsedForEdit
> 		true,									// m_bUsedForDemonstration
> 		false,									// m_bUsedForHowToPlay
> 		"quad",								// m_szName
> 		STEPS_TYPE_DANCE_SINGLE,				// m_StepsType
> 		Style::TWO_PLAYERS_TWO_CREDITS,		// m_StyleType
> 		{ 80, 240, 400, 560 },							// m_iCenterX
> 		4,										// m_iColsPerPlayer
> 		{	// m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
> 			{	// PLAYER_1
> 				{ TRACK_1,	GAME_CONTROLLER_1,	DANCE_BUTTON_LEFT,	-DANCE_COL_SPACING*0.75f },
> 				{ TRACK_2,	GAME_CONTROLLER_1,	DANCE_BUTTON_DOWN,	-DANCE_COL_SPACING*0.25f },
> 				{ TRACK_3,	GAME_CONTROLLER_1,	DANCE_BUTTON_UP,	+DANCE_COL_SPACING*0.25f },
> 				{ TRACK_4,	GAME_CONTROLLER_1,	DANCE_BUTTON_RIGHT,	+DANCE_COL_SPACING*0.75f },
> 			},
> 			{	// PLAYER_2
> 				{ TRACK_1,	GAME_CONTROLLER_2,	DANCE_BUTTON_LEFT,	-DANCE_COL_SPACING*0.75f },
> 				{ TRACK_2,	GAME_CONTROLLER_2,	DANCE_BUTTON_DOWN,	-DANCE_COL_SPACING*0.25f },
> 				{ TRACK_3,	GAME_CONTROLLER_2,	DANCE_BUTTON_UP,	+DANCE_COL_SPACING*0.25f },
> 				{ TRACK_4,	GAME_CONTROLLER_2,	DANCE_BUTTON_RIGHT,	+DANCE_COL_SPACING*0.75f },
> 			},
> 			{	// PLAYER_3
> 				{ TRACK_1,	GAME_CONTROLLER_1,	DANCE_BUTTON_UPLEFT,	-DANCE_COL_SPACING*0.75f },
> 				{ TRACK_2,	GAME_CONTROLLER_1,	DANCE_BUTTON_MENUDOWN,	-DANCE_COL_SPACING*0.25f },
> 				{ TRACK_3,	GAME_CONTROLLER_1,	DANCE_BUTTON_MENUUP,	+DANCE_COL_SPACING*0.25f },
> 				{ TRACK_4,	GAME_CONTROLLER_1,	DANCE_BUTTON_UPRIGHT,	+DANCE_COL_SPACING*0.75f },
> 			},
> 			{	// PLAYER_4
> 				{ TRACK_1,	GAME_CONTROLLER_2,	DANCE_BUTTON_UPLEFT,	-DANCE_COL_SPACING*0.75f },
> 				{ TRACK_2,	GAME_CONTROLLER_2,	DANCE_BUTTON_MENULEFT,	-DANCE_COL_SPACING*0.25f },
> 				{ TRACK_3,	GAME_CONTROLLER_2,	DANCE_BUTTON_MENURIGHT,	+DANCE_COL_SPACING*0.25f },
> 				{ TRACK_4,	GAME_CONTROLLER_2,	DANCE_BUTTON_UPRIGHT,	+DANCE_COL_SPACING*0.75f },
> 			},
> 		},
> 		{	// m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
> 			0, 1, 2, 3
> 		},
> 		false, // m_bNeedsZoomOutWith2Players
> 		true, // m_bCanUseBeginnerHelper
> 	},
Index: InputQueue.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/InputQueue.cpp,v
retrieving revision 1.17
diff -r1.17 InputQueue.cpp
15,16c15,16
< 	FOREACH_PlayerNumber( p )
< 		m_aQueue[p].insert(m_aQueue[p].begin(), MAX_INPUT_QUEUE_LENGTH, GameButtonAndTime() );
---
> 	FOREACH_GameController( gc )
> 		m_aQueue[gc].insert(m_aQueue[gc].begin(), MAX_INPUT_QUEUE_LENGTH, GameButtonAndTime() );
Index: OptionsCursor.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/OptionsCursor.cpp,v
retrieving revision 1.10
diff -r1.10 OptionsCursor.cpp
33a34,35
> 	case PLAYER_3:		iBaseFrameNo = 5;	break;
> 	case PLAYER_4:		iBaseFrameNo = 7;	break;
Index: PlayerNumber.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/PlayerNumber.cpp,v
retrieving revision 1.7
diff -r1.7 PlayerNumber.cpp
13a14,15
> 		case PLAYER_3:	return COLOR_P3;
> 		case PLAYER_4:	return COLOR_P4;
Index: PlayerNumber.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/PlayerNumber.h,v
retrieving revision 1.12
diff -r1.12 PlayerNumber.h
15a16,17
> 	PLAYER_3,
> 	PLAYER_4,
Index: ProductInfo.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ProductInfo.h,v
retrieving revision 1.31
diff -r1.31 ProductInfo.h
5c5
< #define PRODUCT_VER "3.9 random build"
---
> #define PRODUCT_VER "QUAD 8/15/2004 BUILD"
Index: ProductInfo.inc
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ProductInfo.inc,v
retrieving revision 1.28
diff -r1.28 ProductInfo.inc
5c5
< !define PRODUCT_VER "3.9 random build"
---
> !define PRODUCT_VER "QUAD 8-16-2004 CRAZYNESS"
Index: ScreenGameplay.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/ScreenGameplay.cpp,v
retrieving revision 1.536
diff -r1.536 ScreenGameplay.cpp
971c971,973
< 		GAMESTATE->m_PlayerOptions[1].m_fScrolls[PlayerOptions::SCROLL_REVERSE] == 1
---
> 		GAMESTATE->m_PlayerOptions[1].m_fScrolls[PlayerOptions::SCROLL_REVERSE] == 1,
> 		GAMESTATE->m_PlayerOptions[2].m_fScrolls[PlayerOptions::SCROLL_REVERSE] == 1,
> 		GAMESTATE->m_PlayerOptions[3].m_fScrolls[PlayerOptions::SCROLL_REVERSE] == 1
Index: StepMania.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/StepMania.cpp,v
retrieving revision 1.492
diff -r1.492 StepMania.cpp
1042a1043
> 	LOG->Info("NOTE!");
Index: StepMania.dsp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/StepMania.dsp,v
retrieving revision 1.429
diff -r1.429 StepMania.dsp
62c62
< TargetDir=\temp\stepmania\Program
---
> TargetDir=\stepmania\stepmania\Program
65c65
< PreLink_Cmds=disasm\verinc                                                                                                                                	cl                                                                                                                                /Zl                                                                                                                                /nologo                                                                                                                                /c                                                                                                                                verstub.cpp                                                                                                                                /Fo$(IntDir)\ 
---
> PreLink_Cmds=disasm\verinc                                                                                                                                 	cl                                                                                                                                 /Zl                                                                                                                                 /nologo                                                                                                                                 /c                                                                                                                                 verstub.cpp                                                                                                                                 /Fo$(IntDir)\ 
99c99
< TargetDir=\temp\stepmania\Program
---
> TargetDir=\stepmania\stepmania\Program
102c102
< PreLink_Cmds=disasm\verinc                                                                                                                                 	cl                                                                                          /Zl                                                                                          /nologo                                                                                          /c                                                                                          verstub.cpp                                                                                          /Fo$(IntDir)\ 
---
> PreLink_Cmds=disasm\verinc                                                                                                                                  	cl                                                                                           /Zl                                                                                           /nologo                                                                                           /c                                                                                           verstub.cpp                                                                                           /Fo$(IntDir)\