part two of three re: Actors/

This commit is contained in:
AJ Kelly
2011-10-02 21:40:33 -05:00
parent e14b96cfbf
commit 264ba574fb
64 changed files with 67 additions and 67 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef ActorUtil_H
#define ActorUtil_H
#include "Actors/Actor.h"
#include "Actor.h"
#include "RageTexture.h"
class XNode;
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef AttackDisplay_H
#define AttackDisplay_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "Sprite.h"
#include "GameConstantsAndTypes.h" // for TapNoteScore
#include "RageTexturePreloader.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "AutoActor.h"
#include "ThemeManager.h"
#include "Actors/Actor.h"
#include "Actor.h"
#include "ActorUtil.h"
void AutoActor::Unload()
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef BGANIMATION_H
#define BGANIMATION_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
class XNode;
+1 -1
View File
@@ -2,7 +2,7 @@
#define BGANIMATIONLAYER_H
#include "GameConstantsAndTypes.h"
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include <map>
class XNode;
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef BACKGROUND_H
#define BACKGROUND_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "Quad.h"
#include "PlayerNumber.h"
#include "BackgroundUtil.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef BEGINNER_HELPER_H
#define BEGINNER_HELPER_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "Character.h"
#include "Sprite.h"
#include "AutoActor.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef BITMAP_TEXT_H
#define BITMAP_TEXT_H
#include "Actors/Actor.h"
#include "Actor.h"
#include <map>
class RageTexture;
+1 -1
View File
@@ -3,7 +3,7 @@
#include "PlayerNumber.h"
#include "GameConstantsAndTypes.h"
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
/** @brief Multiple Players sharing one LifeMeter. */
class CombinedLifeMeter : public ActorFrame
+1 -1
View File
@@ -2,7 +2,7 @@
#ifndef COMBO_GRAPH_H
#define COMBO_GRAPH_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "PlayerNumber.h"
#include "ThemeMetric.h"
+1 -1
View File
@@ -3,7 +3,7 @@
#ifndef ControllerStateDisplay_H
#define ControllerStateDisplay_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "ActorUtil.h"
#include "PlayerNumber.h"
#include "AutoActor.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef COURSE_CONTENTS_LIST_H
#define COURSE_CONTENTS_LIST_H
#include "Actors/ActorScroller.h"
#include "ActorScroller.h"
class CourseEntryDisplay;
/** @brief Holds course name and banner. */
class CourseContentsList : public ActorScroller
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef DancingCharacters_H
#define DancingCharacters_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "PlayerNumber.h"
#include "ThemeManager.h"
#include "RageTimer.h"
+1 -1
View File
@@ -2,7 +2,7 @@
#ifndef DIFFICULTY_LIST_H
#define DIFFICULTY_LIST_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "PlayerNumber.h"
#include "StepsDisplay.h"
#include "ThemeMetric.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef DUAL_SCROLLBAR_H
#define DUAL_SCROLLBAR_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "AutoActor.h"
#include "PlayerNumber.h"
/** @brief A scrollbar with two independent thumbs. */
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef ACTOR_SCROLLER_H
#define ACTOR_SCROLLER_H
#include "Actors/ActorScroller.h"
#include "ActorScroller.h"
#include "LuaReference.h"
/** @brief ActorScroller that fills in its children on the fly. */
class DynamicActorScroller: public ActorScroller
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef EDIT_MENU_H
#define EDIT_MENU_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "FadingBanner.h"
#include "TextBanner.h"
#include "GameConstantsAndTypes.h"
+1 -1
View File
@@ -4,7 +4,7 @@
#define FADING_BANNER_H
#include "Banner.h"
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "RageTimer.h"
class FadingBanner : public ActorFrame
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef FOREGROUND_H
#define FOREGROUND_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
class Song;
/** @brief Foreground in front of notes while playing. */
+1 -1
View File
@@ -1,6 +1,6 @@
#include "global.h"
#include "GameState.h"
#include "Actors/Actor.h"
#include "Actor.h"
#include "AdjustSync.h"
#include "AnnouncerManager.h"
#include "Bookkeeper.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef GHOSTARROWROW_H
#define GHOSTARROWROW_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "GameConstantsAndTypes.h"
#include "NoteTypes.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef GRADE_DISPLAY_H
#define GRADE_DISPLAY_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "Grade.h"
#include "PlayerNumber.h"
#include "AutoActor.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef GRAPH_DISPLAY_H
#define GRAPH_DISPLAY_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "AutoActor.h"
class StageStats;
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef GROOVE_RADAR_H
#define GROOVE_RADAR_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "Sprite.h"
#include "AutoActor.h"
#include "PlayerNumber.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef HOLD_JUDGMENT_H
#define HOLD_JUDGMENT_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "GameConstantsAndTypes.h"
#include "PlayerNumber.h"
#include "AutoActor.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef Inventory_H
#define Inventory_H
#include "Actors/Actor.h"
#include "Actor.h"
#include "PlayerNumber.h"
#include "RageSound.h"
#include "ScreenMessage.h"
+1 -1
View File
@@ -3,7 +3,7 @@
#include "PlayerNumber.h"
#include "GameConstantsAndTypes.h"
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "SongOptions.h"
class PlayerState;
+1 -1
View File
@@ -8,7 +8,7 @@
#include "InputMapper.h"
#include "Game.h"
#include "PrefsManager.h"
#include "Actors/Actor.h"
#include "Actor.h"
#include "Preference.h"
#include "Foreach.h"
#include "GameManager.h"
+1 -1
View File
@@ -3,7 +3,7 @@
#ifndef LuaExpressionTransform_H
#define LuaExpressionTransform_H
#include "Actors/Actor.h"
#include "Actor.h"
#include "LuaReference.h"
#include <map>
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef LYRIC_DISPLAY_H
#define LYRIC_DISPLAY_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "BitmapText.h"
/** @brief Displays lyrics along with the song on Gameplay. */
class LyricDisplay: public ActorFrame
+1 -1
View File
@@ -4,7 +4,7 @@
#include "GameConstantsAndTypes.h"
#include "PlayerNumber.h"
#include "Sprite.h"
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
/** @brief A graphic displaying the state of memory cards. */
class MemoryCardDisplay : public ActorFrame
{
+1 -1
View File
@@ -3,7 +3,7 @@
#ifndef MENU_TIMER_H
#define MENU_TIMER_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "BitmapText.h"
#include "RageSound.h"
#include "ThemeMetric.h"
+1 -1
View File
@@ -3,7 +3,7 @@
#ifndef METER_DISPLAY_H
#define METER_DISPLAY_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "AutoActor.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef ModIcon_H
#define ModIcon_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "AutoActor.h"
#include "BitmapText.h"
#include "PlayerNumber.h"
+1 -1
View File
@@ -3,7 +3,7 @@
#ifndef ModIconRow_H
#define ModIconRow_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "ModIcon.h"
#include "ThemeMetric.h"
class PlayerOptions;
+1 -1
View File
@@ -3,7 +3,7 @@
#ifndef MODEL_H
#define MODEL_H
#include "Actors/Actor.h"
#include "Actor.h"
#include "RageTypes.h"
#include "ModelTypes.h"
#include <vector>
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef MUSIC_WHEEL_ITEM_H
#define MUSIC_WHEEL_ITEM_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "BitmapText.h"
#include "WheelNotifyIcon.h"
#include "TextBanner.h"
+1 -1
View File
@@ -4,7 +4,7 @@
#include "TimingData.h"
#include "SongPosition.h"
#include "Sprite.h"
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "BitmapText.h"
#include "Quad.h"
#include "NoteDisplay.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef NOTE_SKIN_MANAGER_H
#define NOTE_SKIN_MANAGER_H
#include "Actors/Actor.h"
#include "Actor.h"
#include "RageTypes.h"
#include "PlayerNumber.h"
#include "IniFile.h"
+1 -1
View File
@@ -3,7 +3,7 @@
#ifndef OptionRow_H
#define OptionRow_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "BitmapText.h"
#include "OptionsCursor.h"
#include "ModIcon.h"
+1 -1
View File
@@ -2,7 +2,7 @@
#define OPTIONS_CURSOR_H
#include "Sprite.h"
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "PlayerNumber.h"
#include "AutoActor.h"
/** @brief A cursor for ScreenOptions. */
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef PANE_DISPLAY_H
#define PANE_DISPLAY_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "ActorUtil.h"
#include "PlayerNumber.h"
#include "BitmapText.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef PERCENTAGE_DISPLAY_H
#define PERCENTAGE_DISPLAY_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "PlayerNumber.h"
#include "BitmapText.h"
#include "StageStats.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef PLAYER_H
#define PLAYER_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "HoldJudgment.h"
#include "NoteDataWithScoring.h"
#include "RageSound.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef RECEPTOR_ARROW_H
#define RECEPTOR_ARROW_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "AutoActor.h"
#include "PlayerNumber.h"
#include "GameConstantsAndTypes.h"
+1 -1
View File
@@ -2,7 +2,7 @@
#define RECEPTOR_ARROW_ROW_H
#include "ReceptorArrow.h"
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "GameConstantsAndTypes.h"
class PlayerState;
+1 -1
View File
@@ -4,7 +4,7 @@
#define ROOM_INFO_DISPLAY_H
#include "RoomWheel.h"
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
class RoomInfoDisplay : public ActorFrame
{
+1 -1
View File
@@ -2,7 +2,7 @@
#define SCORE_DISPLAY_H
#include "PlayerNumber.h"
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "GameConstantsAndTypes.h"
class PlayerState;
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef SCREEN_H
#define SCREEN_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "ScreenMessage.h"
#include "InputFilter.h"
#include "ThemeMetric.h"
+1 -1
View File
@@ -6,7 +6,7 @@
#include "ScreenWithMenuElements.h"
#include "BitmapText.h"
#include "InputMapper.h"
#include "Actors/ActorScroller.h"
#include "ActorScroller.h"
#include "RageSound.h"
class ScreenMapControllers : public ScreenWithMenuElements
+1 -1
View File
@@ -6,7 +6,7 @@
#include "ScreenWithMenuElements.h"
#include "BitmapText.h"
#include "InputMapper.h"
#include "Actors\ActorScroller.h"
#include "ActorScroller.h"
#include "RageSound.h"
#include "EnumHelper.h"
#include "ThemeMetric.h"
+1 -1
View File
@@ -6,7 +6,7 @@
#include "ThemeManager.h"
#include "RageTimer.h"
#include "ActorUtil.h"
#include "Actors/Actor.h"
#include "Actor.h"
#include "GameSoundManager.h"
#include "MenuTimer.h"
#include "NetworkSyncManager.h"
+1 -1
View File
@@ -5,7 +5,7 @@
#include "RageSound.h"
#include "RandomSample.h"
#include "ActorUtil.h"
#include "Actors/ActorScroller.h"
#include "ActorScroller.h"
enum MenuDir
{
+1 -1
View File
@@ -3,7 +3,7 @@
#ifndef SCROLL_BAR_H
#define SCROLL_BAR_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "AutoActor.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef SNAPDISPLAY_H
#define SNAPDISPLAY_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "NoteTypes.h"
#include "Sprite.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef SPRITE_H
#define SPRITE_H
#include "Actors/Actor.h"
#include "Actor.h"
#include "RageTextureID.h"
void TexCoordArrayFromRect( float fImageCoords[8], const RectF &rect );
+4 -4
View File
@@ -50,7 +50,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;Actors"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
ExceptionHandling="0"
BasicRuntimeChecks="3"
@@ -158,7 +158,7 @@
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="2"
AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;Actors"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
StringPooling="true"
MinimalRebuild="false"
@@ -263,7 +263,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;Actors"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
ExceptionHandling="0"
BasicRuntimeChecks="0"
@@ -371,7 +371,7 @@
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;Actors"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
StringPooling="true"
MinimalRebuild="false"
+1 -1
View File
@@ -7,7 +7,7 @@
#include "GameConstantsAndTypes.h"
#include "ActorUtil.h"
#include "Difficulty.h"
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "ThemeMetric.h"
#include "Sprite.h"
+1 -1
View File
@@ -2,7 +2,7 @@
#ifndef StreamDisplay_H
#define StreamDisplay_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "Sprite.h"
#include "Quad.h"
#include "LuaExpressionTransform.h"
+1 -1
View File
@@ -3,7 +3,7 @@
#ifndef TEXTBANNER_H
#define TEXTBANNER_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "BitmapText.h"
class Song;
+1 -1
View File
@@ -3,7 +3,7 @@
#ifndef TRANSITION_H
#define TRANSITION_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "AutoActor.h"
#include "ScreenMessage.h"
+1 -1
View File
@@ -2,7 +2,7 @@
#define WHEELBASE_H
#include "AutoActor.h"
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "RageSound.h"
#include "GameConstantsAndTypes.h"
#include "ScreenMessage.h"
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef WHEEL_ITEM_BASE_H
#define WHEEL_ITEM_BASE_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "BitmapText.h"
#include "ThemeMetric.h"
#include "GameConstantsAndTypes.h"
+1 -1
View File
@@ -3,7 +3,7 @@
#ifndef WorkoutGraph_H
#define WorkoutGraph_H
#include "Actors/ActorFrame.h"
#include "ActorFrame.h"
#include "Sprite.h"
class Trail;