From e14b96cfbfaf4839c8ec6acd54948150c6078918 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 2 Oct 2011 21:14:01 -0500 Subject: [PATCH] part one of three-ish in reverting the Actors/ folder thing --- src/{Actors => }/Actor.cpp | 0 src/{Actors => }/Actor.h | 0 src/{Actors => }/ActorFrame.cpp | 0 src/{Actors => }/ActorFrame.h | 0 src/{Actors => }/ActorFrameTexture.cpp | 0 src/{Actors => }/ActorFrameTexture.h | 0 src/{Actors => }/ActorMultiTexture.cpp | 0 src/{Actors => }/ActorMultiTexture.h | 0 src/{Actors => }/ActorProxy.cpp | 0 src/{Actors => }/ActorProxy.h | 0 src/{Actors => }/ActorScroller.cpp | 0 src/{Actors => }/ActorScroller.h | 0 src/{Actors => }/ActorSound.cpp | 0 src/{Actors => }/ActorSound.h | 0 src/Makefile.am | 12 +++++------ src/StepMania-net2003.vcproj | 28 ++++++++++++------------ src/StepMania-net2005.vcproj | 28 ++++++++++++------------ src/StepMania-net2008.vcproj | 28 ++++++++++++------------ src/StepMania-net2010.vcxproj | 30 +++++++++++++------------- src/StepMania-net2010.vcxproj.filters | 28 ++++++++++++------------ 20 files changed, 77 insertions(+), 77 deletions(-) rename src/{Actors => }/Actor.cpp (100%) rename src/{Actors => }/Actor.h (100%) rename src/{Actors => }/ActorFrame.cpp (100%) rename src/{Actors => }/ActorFrame.h (100%) rename src/{Actors => }/ActorFrameTexture.cpp (100%) rename src/{Actors => }/ActorFrameTexture.h (100%) rename src/{Actors => }/ActorMultiTexture.cpp (100%) rename src/{Actors => }/ActorMultiTexture.h (100%) rename src/{Actors => }/ActorProxy.cpp (100%) rename src/{Actors => }/ActorProxy.h (100%) rename src/{Actors => }/ActorScroller.cpp (100%) rename src/{Actors => }/ActorScroller.h (100%) rename src/{Actors => }/ActorSound.cpp (100%) rename src/{Actors => }/ActorSound.h (100%) diff --git a/src/Actors/Actor.cpp b/src/Actor.cpp similarity index 100% rename from src/Actors/Actor.cpp rename to src/Actor.cpp diff --git a/src/Actors/Actor.h b/src/Actor.h similarity index 100% rename from src/Actors/Actor.h rename to src/Actor.h diff --git a/src/Actors/ActorFrame.cpp b/src/ActorFrame.cpp similarity index 100% rename from src/Actors/ActorFrame.cpp rename to src/ActorFrame.cpp diff --git a/src/Actors/ActorFrame.h b/src/ActorFrame.h similarity index 100% rename from src/Actors/ActorFrame.h rename to src/ActorFrame.h diff --git a/src/Actors/ActorFrameTexture.cpp b/src/ActorFrameTexture.cpp similarity index 100% rename from src/Actors/ActorFrameTexture.cpp rename to src/ActorFrameTexture.cpp diff --git a/src/Actors/ActorFrameTexture.h b/src/ActorFrameTexture.h similarity index 100% rename from src/Actors/ActorFrameTexture.h rename to src/ActorFrameTexture.h diff --git a/src/Actors/ActorMultiTexture.cpp b/src/ActorMultiTexture.cpp similarity index 100% rename from src/Actors/ActorMultiTexture.cpp rename to src/ActorMultiTexture.cpp diff --git a/src/Actors/ActorMultiTexture.h b/src/ActorMultiTexture.h similarity index 100% rename from src/Actors/ActorMultiTexture.h rename to src/ActorMultiTexture.h diff --git a/src/Actors/ActorProxy.cpp b/src/ActorProxy.cpp similarity index 100% rename from src/Actors/ActorProxy.cpp rename to src/ActorProxy.cpp diff --git a/src/Actors/ActorProxy.h b/src/ActorProxy.h similarity index 100% rename from src/Actors/ActorProxy.h rename to src/ActorProxy.h diff --git a/src/Actors/ActorScroller.cpp b/src/ActorScroller.cpp similarity index 100% rename from src/Actors/ActorScroller.cpp rename to src/ActorScroller.cpp diff --git a/src/Actors/ActorScroller.h b/src/ActorScroller.h similarity index 100% rename from src/Actors/ActorScroller.h rename to src/ActorScroller.h diff --git a/src/Actors/ActorSound.cpp b/src/ActorSound.cpp similarity index 100% rename from src/Actors/ActorSound.cpp rename to src/ActorSound.cpp diff --git a/src/Actors/ActorSound.h b/src/ActorSound.h similarity index 100% rename from src/Actors/ActorSound.h rename to src/ActorSound.h diff --git a/src/Makefile.am b/src/Makefile.am index 17d251d7dc..8eb50d2100 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -454,12 +454,12 @@ RageUtil_AutoPtr.h \ RageUtil_WorkerThread.cpp RageUtil_WorkerThread.h Actors = \ -Actors/Actor.cpp Actors/Actor.h Actors/ActorFrame.cpp Actors/ActorFrame.h \ -Actors/ActorFrameTexture.cpp Actors/ActorFrameTexture.h \ -Actors/ActorMultiTexture.cpp Actors/ActorMultiTexture.h \ -Actors/ActorProxy.cpp Actors/ActorProxy.h \ -Actors/ActorScroller.cpp Actors/ActorScroller.h ActorUtil.cpp ActorUtil.h \ -Actors/ActorSound.cpp Actors/ActorSound.h \ +Actor.cpp Actor.h ActorFrame.cpp ActorFrame.h \ +ActorFrameTexture.cpp ActorFrameTexture.h \ +ActorMultiTexture.cpp ActorMultiTexture.h \ +ActorProxy.cpp ActorProxy.h \ +ActorScroller.cpp ActorScroller.h ActorUtil.cpp ActorUtil.h \ +ActorSound.cpp ActorSound.h \ AutoActor.cpp AutoActor.h \ BitmapText.cpp BitmapText.h Model.cpp Model.h \ DynamicActorScroller.cpp DynamicActorScroller.h \ diff --git a/src/StepMania-net2003.vcproj b/src/StepMania-net2003.vcproj index e716c59613..d9228ee33f 100644 --- a/src/StepMania-net2003.vcproj +++ b/src/StepMania-net2003.vcproj @@ -2956,46 +2956,46 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ Name="Actors" Filter=""> + RelativePath="Actor.cpp"> + RelativePath="Actor.h"> + RelativePath="ActorFrame.cpp"> + RelativePath="ActorFrame.h"> + RelativePath="ActorFrameTexture.cpp"> + RelativePath="ActorFrameTexture.h"> + RelativePath="ActorMultiTexture.cpp"> + RelativePath="ActorMultiTexture.h"> + RelativePath="ActorProxy.cpp"> + RelativePath="ActorProxy.h"> + RelativePath="ActorScroller.cpp"> + RelativePath="ActorScroller.h"> + RelativePath="ActorSound.cpp"> + RelativePath="ActorSound.h"> diff --git a/src/StepMania-net2005.vcproj b/src/StepMania-net2005.vcproj index 9f0042087e..fe091bd4a3 100644 --- a/src/StepMania-net2005.vcproj +++ b/src/StepMania-net2005.vcproj @@ -4654,59 +4654,59 @@ Name="Actors" > - - - - - - - - + + + + + + + + @@ -2084,13 +2084,13 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir) - - - - - - - + + + + + + + diff --git a/src/StepMania-net2010.vcxproj.filters b/src/StepMania-net2010.vcxproj.filters index 1ce13dfe16..23b5698cf5 100644 --- a/src/StepMania-net2010.vcxproj.filters +++ b/src/StepMania-net2010.vcxproj.filters @@ -1242,25 +1242,25 @@ Rage - + Actors - + Actors - + Actors - + Actors - + Actors - + Actors - + Actors @@ -2777,25 +2777,25 @@ Rage - + Actors - + Actors - + Actors - + Actors - + Actors - + Actors - + Actors