woops. merge

2011-02-25 02:09:55 -08:00
parent dc493450bf 2f01969781
commit c2dbfabb0c
45 changed files with 1429 additions and 767 deletions
@@ -13,6 +13,10 @@ _____________________________________________________________________________
 sm-ssc v1.2.3 | 2011022?
 --------------------------------------------------------------------------------

+20110225
+--------
+* Add lifts and fakes to all Pump noteskins. [Daisuke Master, Wolfman2000]
+
 20110224
 --------
 * [NotesLoaderSSC] Allowed reading of #NOTES2 again. [AJ]
@@ -1 +0,0 @@
-Center Tap Note (doubleres) 3x2.png
@@ -1 +0,0 @@
-DownLeft Tap Note (doubleres) 3x2.png
@@ -1 +0,0 @@
-DownRight Tap Note (doubleres) 3x2.png
@@ -1 +0,0 @@
-UpLeft Tap Note (doubleres) 3x2.png
@@ -1 +0,0 @@
-UpRight Tap Note (doubleres) 3x2.png
@@ -1 +0,0 @@
-Center Tap Note 5x1 (doubleres).png
@@ -1 +0,0 @@
-DownLeft Tap Note 6x1 (doubleres).png
@@ -1 +0,0 @@
-DownRight Tap Note 6x1 (doubleres).png
@@ -1 +0,0 @@
-UpLeft Tap Note 6x1 (doubleres).png
@@ -1 +0,0 @@
-UpRight Tap Note 6x1 (doubleres).png
@@ -1 +0,0 @@
-Center Tap Note 3x2.png
@@ -1 +0,0 @@
-DownLeft Tap Note 3x2.png
@@ -1 +0,0 @@
-DownRight Tap Note 3x2.png
@@ -118,6 +118,10 @@ local function func()
 		t.BaseRotationZ=Noteskin.BaseRotZ[sButton]
 	end
 	
+	if sElement == "Tap Lift" then
+		t.InitCommand=cmd(pulse;effectclock,"beat";effectmagnitude,1,0.75,0);
+	end
+	
 	return t
 end

@@ -1 +0,0 @@
-UpLeft Tap Note 3x2.png
@@ -1 +0,0 @@
-UpRight Tap Note 3x2.png
@@ -1 +0,0 @@
-Center Tap Note 8x1 (doubleres).png
@@ -1 +0,0 @@
-DownLeft Tap Note 8x1 (doubleres).png
@@ -1 +0,0 @@
-DownRight Tap Note 8x1 (doubleres).png
@@ -1 +0,0 @@
-UpLeft Tap Note 8x1 (doubleres).png
@@ -1 +0,0 @@
-UpRight Tap Note 8x1 (doubleres).png
@@ -1 +0,0 @@
-Center Tap Note 3x2.png
@@ -1 +0,0 @@
-DownLeft Tap Note 3x2.png
@@ -1 +0,0 @@
-DownRight Tap Note 3x2.png
@@ -1 +0,0 @@
-UpLeft Tap Note 3x2.png
@@ -1 +0,0 @@
-UpRight Tap Note 3x2.png
@@ -1 +0,0 @@
-_Center Tap Note 6x8.png
@@ -1 +0,0 @@
-_DownLeft Tap Note 6x8.png
@@ -1 +0,0 @@
-_UpLeft Tap Note 6x8.png
@@ -1 +0,0 @@
-Center Tap Note 8x1.png
@@ -1 +0,0 @@
-DownLeft Tap Note 8x1.png
@@ -1 +0,0 @@
-DownRight Tap Note 8x1.png
@@ -1 +0,0 @@
-UpLeft Tap Note 8x1.png
@@ -1 +0,0 @@
-UpRight Tap Note 8x1.png
@@ -1,4 +1,3 @@
-/* DancingCharacters - Characters that react to how the players are doing. */
 #ifndef DancingCharacters_H
 #define DancingCharacters_H

@@ -9,20 +8,22 @@
 #include "AutoActor.h"
 class Model;

+/** @brief The different animation states for the dancer. */
 enum ANIM_STATES_2D
 {
-	AS2D_IDLE = 0,
-	AS2D_MISS,
-	AS2D_GOOD,
-	AS2D_GREAT,
-	AS2D_FEVER,
-	AS2D_FAIL,
-	AS2D_WIN,
-	AS2D_WINFEVER,
-	AS2D_IGNORE, // special case -- so that we can timer to idle again.
-	AS2D_MAXSTATES // leave at end
+	AS2D_IDLE = 0, /**< The dancer is idle. */
+	AS2D_MISS, /**< The dancer just missed a note. */
+	AS2D_GOOD, /**< The dancer is doing a good job. */
+	AS2D_GREAT, /**< The dancer is doing a great job. */
+	AS2D_FEVER, /**< The dancer is on fire! */
+	AS2D_FAIL, /**< The dancer has failed. */
+	AS2D_WIN, /**< The dancer has won. */
+	AS2D_WINFEVER, /**< The dancer has won while on fire. */
+	AS2D_IGNORE, /**< This is a special case -- so that we can timer to idle again. */
+	AS2D_MAXSTATES /**< A count of the maximum number of states. */
 };

+/** @brief Characters that react to how the players are doing. */
 class DancingCharacters : public ActorFrame
 {
 public:
@@ -39,6 +40,7 @@ protected:

 	Model	*m_pCharacter[NUM_PLAYERS];

+	/** @brief How far away is the camera from the dancer? */
 	float	m_CameraDistance;
 	float	m_CameraPanYStart;
 	float	m_CameraPanYEnd;
@@ -65,8 +67,10 @@ protected:

 #endif

-/*
- * (c) 2003-2004 Chris Danford
+/**
+ * @file
+ * @author Chris Danford (c) 2003-2004
+ * @section LICENSE
 * All rights reserved.
 * 
 * Permission is hereby granted, free of charge, to any person obtaining a
@@ -1,12 +1,10 @@
-/* DualScrollBar - a scrollbar with two independent thumbs. */
-
 #ifndef DUAL_SCROLLBAR_H
 #define DUAL_SCROLLBAR_H

 #include "ActorFrame.h"
 #include "AutoActor.h"
 #include "PlayerNumber.h"
-
+/** @brief A scrollbar with two independent thumbs. */
 class DualScrollBar: public ActorFrame
 {
 public:
@@ -19,6 +17,7 @@ public:
 	void EnablePlayer( PlayerNumber pn, bool on );

 private:
+	/** @brief The height of the scrollbar. */
 	float	m_fBarHeight;
 	float	m_fBarTime;

@@ -28,8 +27,10 @@ private:

 #endif

-/*
- * (c) 2001-2004 Glenn Maynard, Chris Danford
+/**
+ * @file
+ * @author Glenn Maynard, Chris Danford (c) 2001-2004
+ * @section LICENSE
 * All rights reserved.
 * 
 * Permission is hereby granted, free of charge, to any person obtaining a
@@ -36,6 +36,7 @@ enum EditMenuAction
 	NUM_EditMenuAction, /**< The number of MenuActions available to choose from. */
 	EditMenuAction_Invalid
 };
+/** @brief Loop through each EditMenuAction. */
 #define FOREACH_EditMenuAction( ema ) FOREACH_ENUM( EditMenuAction, ema )
 const RString& EditMenuActionToString( EditMenuAction ema );
 const RString& EditMenuActionToLocalizedString( EditMenuAction ema );
@@ -101,7 +102,9 @@ private:
 	BitmapText	m_textLabel[NUM_EditMenuRow];
 	BitmapText	m_textValue[NUM_EditMenuRow];

+	/** @brief The group's banner. */
 	FadingBanner	m_GroupBanner;
+	/** @brief The Song's banner. */
 	FadingBanner	m_SongBanner;
 	TextBanner	m_SongTextBanner;
 	StepsDisplay	m_StepsDisplay;
@@ -114,7 +117,9 @@ private:
 		Difficulty dc;
 	};

+	/** @brief The list of groups. */
 	vector<RString>			m_sGroups;
+	/** @brief The list of Songs in a group. */
 	vector<Song*>			m_pSongs;
 	vector<StepsType>		m_StepsTypes;
 	vector<StepsAndDifficulty>	m_vpSteps;
@@ -127,6 +132,7 @@ private:
 	RageSound m_soundChangeRow;
 	RageSound m_soundChangeValue;

+	/** @brief A metric to determine if groups are shown. */
 	ThemeMetric<bool> SHOW_GROUPS;
 	ThemeMetric1D<float> ARROWS_X;
 	ThemeMetric<apActorCommands> ARROWS_ENABLED_COMMAND;
@@ -139,8 +145,10 @@ public:

 #endif

-/*
- * (c) 2001-2004 Chris Danford
+/**
+ * @file
+ * @author Chris Danford (c) 2001-2004
+ * @section LICENSE
 * All rights reserved.
 * 
 * Permission is hereby granted, free of charge, to any person obtaining a
@@ -1,5 +1,3 @@
-/* Game - Holds information about a particular style of a game (e.g. "single", "double"). */
-
 #ifndef GAMEDEF_H
 #define GAMEDEF_H

@@ -27,21 +25,29 @@ class Style;
 // have the flag FLAG_SECONDARY_MENU_*, they will function as MenuLeft and
 // MenuRight as long as "MenuLeft (optional)" and "MenuRight (optional)" are not mapped.

+/** @brief Holds information about a particular style of a game (e.g. "single", "double"). */
 class Game
 {
 public:
 	const char *		m_szName;
 	const Style * const*	m_apStyles;

-	bool			m_bCountNotesSeparately;	// Count multiple notes in a row as separate notes or as one note
-	bool			m_bAllowHopos;		// allow Hammer-ons and Pull-offs?  Only useful for guitar type input.
+	/** @brief Do we count multiple notes in a row as separate notes, or as one note? */
+	bool			m_bCountNotesSeparately;
+	/** @brief Do we allow for hammer-ons and pull-offs?
+	 *
+	 * This is right now only useful for guitar type input. */
+	bool			m_bAllowHopos;
 	InputScheme		m_InputScheme;

 	struct PerButtonInfo
 	{
 		GameButtonType m_gbt;
 	};
-	// Data for each Game-specific GameButton. This starts at GAME_BUTTON_NEXT.
+	/**
+	 * @brief Data for each Game-specific GameButton.
+	 *
+	 * This starts at GAME_BUTTON_NEXT. */
 	PerButtonInfo		m_PerButtonInfo[NUM_GameButton];
 	const PerButtonInfo *GetPerButtonInfo( GameButton gb ) const;

@@ -58,8 +64,10 @@ public:

 #endif

-/*
- * (c) 2001-2002 Chris Danford
+/**
+ * @file
+ * @author Chris Danford (c) 2001-2002
+ * @section LICENSE
 * All rights reserved.
 * 
 * Permission is hereby granted, free of charge, to any person obtaining a
@@ -73,7 +73,11 @@ public:
 	SortOrder	m_SortOrder;
 	RString		m_sSoundPath;	// "" for no sound
 	vector<RString>	m_vsScreensToPrepare;
-	int		m_iWeightPounds;	// -1 == none specified
+	/**
+	 * @brief What is the player's weight in pounds?
+	 *
+	 * If this value is -1, then no weight was specified. */
+	int		m_iWeightPounds;
 	int		m_iGoalCalories;	// -1 == none specified
 	GoalType	m_GoalType;
 	RString		m_sProfileID;
@@ -116,7 +116,16 @@ void ScreenSMOnlineLogin::HandleScreenMessage(const ScreenMessage SM)
 	else if( SM == SM_SMOnlinePack )
 	{
 		LOG->Trace("[ScreenSMOnlineLogin::HandleScreenMessage] SMOnlinePack");
-		sLoginQuestion = YOU_ARE_LOGGING_ON_AS.GetValue() + "\n" + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n" + ENTER_YOUR_PASSWORD.GetValue();
+		if(!GAMESTATE->IsPlayerEnabled((PlayerNumber) m_iPlayer))
+		{
+			LOG->Warn("Invalid player number: %i", m_iPlayer);
+			return;
+		}
+
+		// This can cause problems in certain situations -aj
+		sLoginQuestion = YOU_ARE_LOGGING_ON_AS.GetValue() + "\n"
+			+ GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n" +
+			ENTER_YOUR_PASSWORD.GetValue();
 		int ResponseCode = NSMAN->m_SMOnlinePacket.Read1();
 		if (ResponseCode == 0)
 		{
@@ -1,7 +1,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // $Workfile: stdafx.h $
 // $Archive: /ZipArchive/stdafx.h $
-// $Date: 2006-01-20 13:43:41 -0600 (Fri, 20 Jan 2006) $ $Author: gmaynard $
+// $Date: 2003-07-21 21:10:30 -0500 (Mon, 21 Jul 2003) $ $Author: gmaynard $
 ////////////////////////////////////////////////////////////////////////////////
 // This source file is part of the ZipArchive library source distribution and
 // is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/)
@@ -38,20 +38,10 @@

 #define ZIP_ARCHIVE_MFC

-#if defined(_DEBUG)
-#undef _DEBUG
-#define RESTORE_DEBUG
-#endif
-
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 #include <afx.h>
 #include <afxwin.h>

-#if defined(RESTORE_DEBUG)
-#undef RESTORE_DEBUG
-#define _DEBUG
-#endif
-
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.

@@ -0,0 +1 @@
+Windows MFC