Merge pull request #1 from wolfman2000/wolf-vs-amv-contribution

Set up ActorMultiVertex for other VS projects.

Docs/Luadoc/Lua.xsl

@@ -209,7 +209,7 @@
 <xsl:template match="sm:Lua">
 	<div>
 		<div id="header">
-		<h2><a href="http://code.google.com/p/stepmania/">StepMania 5</a> Lua Information</h2><br/>
+		<h2><a href="https://github.com/stepmania/stepmania/">StepMania 5</a> Lua Information</h2><br/>
 		<small>A collection of Lua bindings which can be used in themes for StepMania 5.</small>
 		</div>
 		<table id="sections">

src/Player.cpp

@@ -2809,7 +2809,7 @@ void Player::UpdateJudgedRows()
 					{
 						const TapNote &tn = m_NoteData.GetTapNote( iTrack, iRow );
 						if (tn.type == TapNote::tap || tn.type == TapNote::lift ||
-						( tn.type == TapNote::hold_head && !REQUIRE_STEP_ON_HOLD_HEADS ) )
+						( tn.type == TapNote::hold_head && REQUIRE_STEP_ON_HOLD_HEADS ) )
 						{
 							viColsWithTaps.push_back( iTrack );
 						};

src/ScreenSelectMusic.cpp

@@ -572,7 +572,7 @@ bool ScreenSelectMusic::Input( const InputEventPlus &input )
 				default: break;
 			}
 		}
-		else if( input.type == IET_FIRST_PRESS && input.MenuI != GAME_BUTTON_SELECT )
+		if( input.type == IET_FIRST_PRESS && input.MenuI != GAME_BUTTON_SELECT )
 		{
 			Message msg("SelectMenuInput");
 			msg.SetParam( "Player", input.pn );

src/StepMania-net2011.vcxproj

@@ -774,6 +774,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
     <ClCompile Include="ActorFrame.cpp" />
     <ClCompile Include="ActorFrameTexture.cpp" />
     <ClCompile Include="ActorMultiTexture.cpp" />
+    <ClCompile Include="ActorMultiVertex.cpp" />
     <ClCompile Include="ActorProxy.cpp" />
     <ClCompile Include="ActorScroller.cpp" />
     <ClCompile Include="ActorSound.cpp" />
@@ -1655,6 +1656,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
     <ClInclude Include="ActorFrame.h" />
     <ClInclude Include="ActorFrameTexture.h" />
     <ClInclude Include="ActorMultiTexture.h" />
+    <ClInclude Include="ActorMultiVertex.h" />
     <ClInclude Include="ActorProxy.h" />
     <ClInclude Include="ActorScroller.h" />
     <ClInclude Include="ActorSound.h" />
@@ -1935,4 +1937,4 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

src/StepMania-net2011.vcxproj.filters

@@ -1239,6 +1239,9 @@
     <ClCompile Include="ActorMultiTexture.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
+    <ClCompile Include="ActorMultiVertex.cpp">
+      <Filter>Actors</Filter>
+    </ClCompile>
     <ClCompile Include="ActorProxy.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
@@ -2621,6 +2624,9 @@
     <ClInclude Include="ActorMultiTexture.h">
       <Filter>Actors</Filter>
     </ClInclude>
+    <ClInclude Include="ActorMultiVertex.h">
+      <Filter>Actors</Filter>
+    </ClInclude>
     <ClInclude Include="ActorProxy.h">
       <Filter>Actors</Filter>
     </ClInclude>
@@ -2869,4 +2875,4 @@
       <Filter>BaseClasses</Filter>
     </CustomBuildStep>
   </ItemGroup>
-</Project>
+</Project>

src/StepMania-net2013.vcxproj

@@ -773,6 +773,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
     <ClCompile Include="ActorFrame.cpp" />
     <ClCompile Include="ActorFrameTexture.cpp" />
     <ClCompile Include="ActorMultiTexture.cpp" />
+    <ClCompile Include="ActorMultiVertex.cpp" />
     <ClCompile Include="ActorProxy.cpp" />
     <ClCompile Include="ActorScroller.cpp" />
     <ClCompile Include="ActorSound.cpp" />
@@ -2094,6 +2095,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
     <ClInclude Include="ActorFrame.h" />
     <ClInclude Include="ActorFrameTexture.h" />
     <ClInclude Include="ActorMultiTexture.h" />
+    <ClInclude Include="ActorMultiVertex.h" />
     <ClInclude Include="ActorProxy.h" />
     <ClInclude Include="ActorScroller.h" />
     <ClInclude Include="ActorSound.h" />
@@ -2395,4 +2397,4 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

src/StepMania-net2013.vcxproj.filters

@@ -1251,6 +1251,9 @@
     <ClCompile Include="ActorMultiTexture.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
+    <ClCompile Include="ActorMultiVertex.cpp">
+      <Filter>Actors</Filter>
+    </ClCompile>
     <ClCompile Include="ActorProxy.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
@@ -2783,6 +2786,9 @@
     <ClInclude Include="ActorMultiTexture.h">
       <Filter>Actors</Filter>
     </ClInclude>
+    <ClInclude Include="ActorMultiVertex.h">
+      <Filter>Actors</Filter>
+    </ClInclude>
     <ClInclude Include="ActorProxy.h">
       <Filter>Actors</Filter>
     </ClInclude>