diff --git a/.hgignore b/.hgignore
index d4a51e972a..7bb444fb3c 100644
--- a/.hgignore
+++ b/.hgignore
@@ -88,3 +88,4 @@ glob:Cache/Banners/AdditionalSongs_Airspace Preview_Derailed_Derailed bn.png
syntax: regexp
Songs/.+/
+glob:*.ilk
diff --git a/Docs/Changelog_SSCformat.txt b/Docs/Changelog_SSCformat.txt
index 3c3378adfe..95b48cf7d7 100644
--- a/Docs/Changelog_SSCformat.txt
+++ b/Docs/Changelog_SSCformat.txt
@@ -6,9 +6,15 @@ a changelog is provided here between each version.
Notice: .ssc is not a finalized format at the moment. There are plans for a
change to JSON, but it is unsure if this will be done.
-/!\ Implement .ssc at your own risk. /!\
+Implement .ssc at your own risk.
________________________________________________________________________________
+[v0.59] - Wolfman2000
+* Typo fix: #RADARVALUES needed a semicolon at the end, not a colon.
+
+[v0.58] - Wolfman2000
+* Implement #LABELS tag for easier Editor work/Rock Band section mimicry.
+
[v0.57] - AJ
* Add #ORIGIN tag to metadata.
diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index a756a24d1b..911c512a32 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -8,6 +8,27 @@ ________________________________________________________________________________
StepMania 5.0 $NEXT | 20110xyy
--------------------------------------------------------------------------------
+2011/05/03
+* [ScreenEdit] Allow changing the Beat 0 Offset, Music Sample Start, and
+ Music Sample Length via Edit Song Info menu. [Wolfman2000]
+
2011/05/02
----------
-* [ScreenSelectMusic] Added NullScoreString metric. [AJ]
\ No newline at end of file
+* [ScreenSelectMusic] Added NullScoreString metric. [AJ]
+
+2011/04/17
+--------
+* Use lua for all primary score keeping. Course modes right now still use the
+ old fashioned system. [TeruFSX, Wolfman2000]
+
+2011/04/09
+--------
+* [Player] Force hold judgments to take place before setting the score.
+ [theDtTvB]
+
+2011/04/05
+--------
+* [NotesLoaderSSC, NotesWriterSSC] Add the #LABELS tag. This is meant for step
+ editors to label different parts of their stepcharts. Use Control + , or . to
+ jump to different labels made. [Wolfman2000]
+
diff --git a/Docs/Luadoc/Lua.xml b/Docs/Luadoc/Lua.xml
index 30d7084c15..f41bb848cb 100644
--- a/Docs/Luadoc/Lua.xml
+++ b/Docs/Luadoc/Lua.xml
@@ -1399,6 +1399,7 @@
+
diff --git a/Docs/Luadoc/LuaDocumentation.xml b/Docs/Luadoc/LuaDocumentation.xml
index e991e0a589..39df9f4188 100644
--- a/Docs/Luadoc/LuaDocumentation.xml
+++ b/Docs/Luadoc/LuaDocumentation.xml
@@ -3501,6 +3501,9 @@
Returns a table of the Delays and the times they happen as strings with the format "beat=stop seconds".
+
+ Returns a table of the Labels and the times they happen as strings with the format "beat=label name."
+
Returns true if the TimingData contains BPM changes.
diff --git a/Themes/_fallback/BGAnimations/ScreenGameplay decorations/default.lua b/Themes/_fallback/BGAnimations/ScreenGameplay decorations/default.lua
new file mode 100644
index 0000000000..8282ba3aa6
--- /dev/null
+++ b/Themes/_fallback/BGAnimations/ScreenGameplay decorations/default.lua
@@ -0,0 +1,11 @@
+local t = Def.ActorFrame {};
+
+if( not GAMESTATE:IsCourseMode() ) then
+t[#t+1] = Def.Actor{
+ JudgmentMessageCommand = function(self, params)
+ Scoring[GetUserPref("UserPrefScoringMode")](params,
+ STATSMAN:GetCurStageStats():GetPlayerStageStats(params.Player))
+ end;
+};
+end;
+return t;
\ No newline at end of file
diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index d9d10e7aca..0847beabb8 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -478,6 +478,9 @@ Edit Course=Edit Course contents.
Shuffle=Shuffle the songs around.
#
GamePrefDefaultFail=Immediate fail causes a player to die when their life bar reaches 0. ImmediateContinue allows you to continue playing afterwards.
+#
+UserPrefScoringMode=Select the scoring mode to be used when not in a course.
+
[OptionNames]
0=0
0.25x=0.25x
@@ -787,6 +790,7 @@ Background=Background
BarDrain=Bar Drain
BatLives=Bat Lives
Base Difficulty=Base Difficulty
+Beat 0 Offset=Beat 0 Offset
Bookkeeping=Bookkeeping
Calibrate Machine Sync=Calibrate Audio Sync
CPUSkill=CPU Skill
@@ -846,6 +850,7 @@ Edit time signature (top)=Edit time signature (beats per measure)
Edit time signature (bottom)=Edit time signature (single beat note value)
Edit tickcount=Edit tickcount
Edit combo=Edit combo
+Edit label=Edit label
Edit warp=Edit warp
Editor options=Options
EditorShowBGChangesPlay=Show Backgrounds
@@ -938,6 +943,8 @@ Predicted Meter=Predicted Meter
Preferences=Preferences
PreloadSounds=Preload Sounds
Premium=Premium
+Preview Length=Preview Length
+Preview Start=Preview Start
Export Packages=Export Packages
Profile=Profile
Profiles=Profiles
@@ -1048,6 +1055,8 @@ Edit Course=Edit Course
Shuffle=Shuffle
#
GamePrefDefaultFail=Default Fail Type
+#
+UserPrefScoringMode=Scoring Mode
[PaneDisplay]
Steps=Steps
Holds=Holds
@@ -1215,6 +1224,7 @@ Enter a new Time Signature numerator value.=Enter the number of beats per measur
Enter a new Time Signature denominator value.=Enter the note value that represents one beat.
Enter a new Tickcount value.=Enter a new Tickcount value.
Enter a new Combo value.=Enter a new Combo value.
+Enter a new Label value.=Enter a name for this section of the chart.
Enter a new Warp value.=Enter the beat you will warp to when you reach this point.
Enter a new artist transliteration.=Enter a new artist transliteration.
Enter a new artist.=Enter a new artist.
@@ -1223,11 +1233,14 @@ Enter a new credit.=Enter a new credit.
Enter a new description.=Enter a new description.
Enter a new chart style.=Enter a new chart style (e.g. "Pad", "Keyboard").
Enter the author who made this step pattern.=Enter the author who made this step pattern.
+Enter the offset for the song.=Enter the beat 0 offset for the song.
Enter a new last beat hint.=Enter a new last beat hint.
Enter a new main title transliteration.=Enter a new main title transliteration.
Enter a new main title.=Enter a new main title.
Enter a new sub title transliteration.=Enter a new sub title transliteration.
Enter a new sub title.=Enter a new sub title.
+Enter a new preview start.=Enter when the music sample starts.
+Enter a new preview length.=Enter how long the music sample lasts.
Enter a new min BPM.=Enter the minimum displayed BPM.
Enter a new max BPM.=Enter the maximum displayed BPM.
More than %d notes per measure is not allowed. This change has been reverted.=More than %d notes per measure is not allowed. This change has been reverted.
diff --git a/Themes/_fallback/Scripts/03 ThemePrefs.lua b/Themes/_fallback/Scripts/03 ThemePrefs.lua
index 0a61da5741..dfa9e3e695 100644
--- a/Themes/_fallback/Scripts/03 ThemePrefs.lua
+++ b/Themes/_fallback/Scripts/03 ThemePrefs.lua
@@ -139,3 +139,40 @@ ThemePrefs =
-- global aliases
GetThemePref = ThemePrefs.Get
SetThemePref = ThemePrefs.Set
+
+
+-- bring in SpecialScoring from default.
+
+function InitUserPrefs()
+ if GetUserPref("UserPrefScoringMode") == nil then
+ SetUserPref("UserPrefScoringMode", 'DDR Extreme');
+ end;
+end;
+
+function UserPrefScoringMode()
+ local baseChoices = { 'DDR 1stMIX', 'DDR 4thMIX', 'DDR Extreme', 'DDR SuperNOVA', 'DDR SuperNOVA 2', 'MIGS' }; --'[SSC] Radar Master'
+ local t = {
+ Name = "UserPrefScoringMode";
+ LayoutType = "ShowAllInRow";
+ SelectType = "SelectOne";
+ OneChoiceForAllPlayers = true;
+ ExportOnChange = false;
+ Choices = baseChoices;
+ LoadSelections = function(self, list, pn)
+ if ReadPrefFromFile("UserPrefScoringMode") ~= nil then
+ local theValue = ReadPrefFromFile("UserPrefScoringMode");
+ local success = false;
+ for k,v in ipairs(baseChoices) do if v == theValue then list[k] = true success = true break end end;
+ if success == false then list[1] = true end;
+ else
+ WritePrefToFile("UserPrefScoringMode", 'DDR Extreme');
+ list[1] = true;
+ end;
+ end;
+ SaveSelections = function(self, list, pn)
+ for k,v in ipairs(list) do if v then WritePrefToFile("UserPrefScoringMode", baseChoices[k]) break end end;
+ end;
+ };
+ setmetatable( t, t );
+ return t;
+end
\ No newline at end of file
diff --git a/Themes/default/Scripts/04 SpecialScoring.lua b/Themes/_fallback/Scripts/04 Scoring.lua
similarity index 64%
rename from Themes/default/Scripts/04 SpecialScoring.lua
rename to Themes/_fallback/Scripts/04 Scoring.lua
index 2f24ebff05..c0bf2b9bda 100644
--- a/Themes/default/Scripts/04 SpecialScoring.lua
+++ b/Themes/_fallback/Scripts/04 Scoring.lua
@@ -1,6 +1,8 @@
+--internals table
+local Shared = {};
--Special Scoring types.
local r = {};
-local DisabledScoringModes = { 'DDR Extreme', '[SSC] Radar Master' };
+local DisabledScoringModes = { '[SSC] Radar Master' };
--the following metatable makes any missing value in a table 0 instead of nil.
local ZeroIfNotFound = { __index = function() return 0 end; };
@@ -30,25 +32,46 @@ end;
r['DDR 1stMIX'] = function(params, pss)
local dCombo = math.floor((pss:GetCurrentCombo()+1)/4);
local bScore = (dCombo^2+1) * 100;
- local multLookup = { ['TapNoteScore_W1']=3, ['TapNoteScore_W2']=3, ['TapNoteScore_W3']=1 };
+ local multLookup =
+ {
+ ['TapNoteScore_W1']=3,
+ ['TapNoteScore_W2']=3,
+ ['TapNoteScore_W3']=1
+ };
setmetatable(multLookup, ZeroIfNotFound);
--if score increases above the boundaries of a 32-bit signed
--(about 2.15 billion), it stops increasing. Conveniently,
--1st Mix clamped score as well.
- pss:SetScore(clamp(pss:GetScore()+(bScore*multLookup[params.TapNoteScore]),0,999999999));
+ local capScore = 999999999;
+ local bestScore = bScore * multLookup['TapNoteScore_W1'];
+ local localScore = bScore * multLookup[params.TapNoteScore];
+ pss:SetCurMaxScore(clamp(pss:GetCurMaxScore()+(bestScore),0,capScore));
+ pss:SetScore(clamp(pss:GetScore()+(localScore),0,capScore));
+
end;
-----------------------------------------------------------
--DDR 4th Mix/Extra Mix/Konamix/GB3/DDRPC Scoring
-----------------------------------------------------------
r['DDR 4thMIX'] = function(params, pss)
- local scoreLookupTable = { ['TapNoteScore_W1']=777, ['TapNoteScore_W2']=777, ['TapNoteScore_W3']=555 };
- setmetatable(scoreLookupTable, ZeroIfNotFound);
+ local scoreLookupTable =
+ {
+ ['TapNoteScore_W1']=777,
+ ['TapNoteScore_W2']=777,
+ ['TapNoteScore_W3']=555
+ };
+ setmetatable(scoreLookupTable, ZeroIfNotFound);
+ -- TODO: Modify this so that current max assumes full combo?
local comboBonusForThisStep = (pss:GetCurrentCombo()+1)*333;
- pss:SetScore(clamp(pss:GetScore()+scoreLookupTable[params.TapNoteScore]+(scoreLookupTable[params.TapNoteScore] and comboBonusForThisStep or 0),0,999999999));
+ local capScore = 999999999;
+ local bestPoints = scoreLookupTable['TapNoteScore_W1'];
+ local bestCombo = bestPoints and comboBonusForThisStep or 0;
+ pss:SeCurMaxScore(clamp(pss:GeCurMaxScore()+bestPoints+bestCombo,0,capScore));
+ local localPoints = scoreLookupTable[params.TapNoteScore];
+ local localCombo = localPoints and comboBonusForThisStep or 0;
+ pss:SetScore(clamp(pss:GetScore()+localPoints+localCombo,0,capScore));
end;
-----------------------------------------------------------
--DDR MAX2/Extreme Scoring
---This scoring system doesn't work and is locked out.
-----------------------------------------------------------
r['DDR Extreme'] = function(params, pss)
local judgmentBase = {
@@ -60,11 +83,17 @@ r['DDR Extreme'] = function(params, pss)
local steps = GAMESTATE:GetCurrentSteps(params.Player);
local radarValues = steps:GetRadarValues(params.Player);
local baseScore = (steps:IsAnEdit() and
- 5 or steps:GetMeter()) * 10000000;
- local currentStep = 0; -- TODO: Get current step/hold.
+ 5 or steps:GetMeter()) * 1000000;
local totalItems = GetTotalItems(radarValues);
local singleStep = (1 + totalItems) * totalItems / 2;
- local stepLast = math.floor(baseScore / singleStep) * currentStep;
+ if (not Shared.CurrentStep) then
+ Shared.CurrentStep = 0
+ end;
+ Shared.CurrentStep = Shared.CurrentStep + 1;
+ local stepValue = math.floor(baseScore /singleStep);
+ local stepLast = stepValue * Shared.CurrentStep;
+ pss:SetCurMaxScore(pss:GetCurMaxScore() +
+ (stepLast * judgmentBase['TapNoteScore_W1']));
local judgeScore = 0;
if (params.HoldNoteScore == 'HoldNoteScore_Held') then
judgeScore = judgmentBase['TapNoteScore_W1'];
@@ -75,29 +104,51 @@ r['DDR Extreme'] = function(params, pss)
end;
end;
local stepScore = judgeScore * stepLast;
-
pss:SetScore(pss:GetScore() + stepScore);
+ if (Shared.CurrentStep >= totalItems) then -- Just in case.
+ -- TODO: Implement the bonus for the last step?
+ Shared.CurrentStep = 0; -- Reset for the next song.
+ end;
end;
-----------------------------------------------------------
--DDR SuperNOVA(-esque) scoring
-----------------------------------------------------------
r['DDR SuperNOVA'] = function(params, pss)
- local multLookup = { ['TapNoteScore_W1'] = 1, ['TapNoteScore_W2'] = 1, ['TapNoteScore_W3'] = 0.5 };
+ local multLookup =
+ {
+ ['TapNoteScore_W1'] = 1,
+ ['TapNoteScore_W2'] = 1,
+ ['TapNoteScore_W3'] = 0.5
+ };
setmetatable(multLookup, ZeroIfNotFound);
local radarValues = GetDirectRadar(params.Player);
local totalItems = GetTotalItems(radarValues);
- local buildScore = (10000000 / totalItems * multLookup[params.TapNoteScore]) + (10000000 / totalItems * (params.HoldNoteScore == 'HoldNoteScore_Held' and 1 or 0));
+ local base = 10000000 / totalItems;
+ local hold = base * (params.HoldNoteScore == 'HoldNoteScore_Held' and 1 or 0);
+ local maxScore = (base * multLookup['TapNoteScore_W1']) + hold;
+ pss:SetCurMaxScore(pss:GetCurMaxScore() + math.round(maxScore));
+ local buildScore = (base * multLookup[params.TapNoteScore]) + hold;
pss:SetScore(pss:GetScore() + math.round(buildScore));
end;
-----------------------------------------------------------
--DDR SuperNOVA 2(-esque) scoring
-----------------------------------------------------------
r['DDR SuperNOVA 2'] = function(params, pss)
- local multLookup = { ['TapNoteScore_W1'] = 1, ['TapNoteScore_W2'] = 1, ['TapNoteScore_W3'] = 0.5 };
+ local multLookup =
+ {
+ ['TapNoteScore_W1'] = 1,
+ ['TapNoteScore_W2'] = 1,
+ ['TapNoteScore_W3'] = 0.5
+ };
setmetatable(multLookup, ZeroIfNotFound);
local radarValues = GetDirectRadar(params.Player);
local totalItems = GetTotalItems(radarValues);
- local buildScore = (100000 / totalItems * multLookup[params.TapNoteScore] - (IsW1Allowed(params.TapNoteScore) and 10 or 0)) + (100000 / totalItems * (params.HoldNoteScore == 'HoldNoteScore_Held' and 1 or 0));
+ local base = 100000 / totalItems;
+ local hold = base * (params.HoldNoteScore == 'HoldNoteScore_Held' and 1 or 0);
+ local maxScore = (base * multLookup['TapNoteScore_W1']) + hold;
+ pss:SetCurMaxScore(pss:GetCurMaxScore() + (math.round(maxScore) * 10));
+ local preW1 = base * multLookup[params.TapNoteScore];
+ local buildScore = (preW1 - (IsW1Allowed(params.TapNoteScore) and 10 or 0)) + hold;
pss:SetScore(pss:GetScore() + (math.round(buildScore) * 10));
end;
-----------------------------------------------------------
@@ -137,19 +188,28 @@ end;
------------------------------------------------------------
r['MIGS'] = function(params,pss)
local curScore = 0;
- local tapScoreTable = { ['TapNoteScore_W1'] = 3, ['TapNoteScore_W2'] = 2, ['TapNoteScore_W3'] = 1, ['TapNoteScore_W5'] = -4, ['TapNoteScore_Miss'] = -8 };
+ local tapScoreTable =
+ {
+ ['TapNoteScore_W1'] = 3,
+ ['TapNoteScore_W2'] = 2,
+ ['TapNoteScore_W3'] = 1,
+ ['TapNoteScore_W5'] = -4,
+ ['TapNoteScore_Miss'] = -8
+ };
for k,v in pairs(tapScoreTable) do
curScore = curScore + ( pss:GetTapNoteScores(k) * v );
end;
curScore = curScore + ( pss:GetHoldNoteScores('HoldNoteScore_Held') * 6 );
pss:SetScore(clamp(curScore,0,math.huge));
end;
-SpecialScoring = {};
-setmetatable(SpecialScoring, {
+
+-- Formulas end here.
+Scoring = {};
+setmetatable(Scoring, {
__metatable = { "Letting you change the metatable sort of defeats the purpose." };
__index = function(tbl, key)
for v in ivalues(DisabledScoringModes) do
- if key == v then return r['DDR 1stMIX']; end;
+ if key == v then return r['DDR Extreme']; end;
end;
return r[key];
end;
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index f9484c2717..31538e98b5 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -1,6 +1,5 @@
# This probably is hard to understand from the way it was made in the first
-# place, so instead just pay attention to each group, which has tons of
-# notes
+# place, so instead just pay attention to each group, which has tons of notes.
# 01 # Global
# 02 # Managers
@@ -476,33 +475,6 @@ PumpRoutineString="Routine"
# Difficulty_Edit-StepsType_Pump_Double=Edit
# Course=Progressive
-[CustomScoring]
-# Custom scoring, usually good for custom games.
-
-# Various tweakers
-ComboAboveThresholdAddsToScoreBonus=0
-ComboScoreBonusThreshold=50
-ComboScoreBonusValue=+1000
-
-ComboMultiplier=0.0
-
-DoubleNoteScoreMultiplier=2.0
-TripleNoteScoreMultiplier=3.0
-QuadOrHigherNoteScoreMultiplier=4.0
-# And what they award you
-PointsW1=+50
-PointsW2=+20
-PointsW3=+10
-PointsW4=+5
-PointsW5=0
-PointsMiss=-5
-PointsHitMine=-5
-PointsCheckpointHit=+5
-PointsCheckpointMiss=-5
-PointsNone=0
-PointsHoldHeld=+5
-PointsHoldLetGo=-5
-
[DifficultyList]
# A list that shows difficulties in a song.
CapitalizeDifficultyNames=false
@@ -1012,6 +984,7 @@ WarpColor=color("1,0,0.5,1")
TimeSignatureColor=color("1,0.55,0,1")
TickcountColor=color("0,1,0,1")
ComboColor=color("0.55,1,0,1")
+LabelColor=color("1,0,0,1")
#
BPMIsLeftSide=true
StopIsLeftSide=true
@@ -1020,6 +993,7 @@ WarpIsLeftSide=false
TimeSignatureIsLeftSide=true
TickcountIsLeftSide=false
ComboIsLeftSide=false
+LabelIsLeftSide=false
#
BPMOffsetX=60
StopOffsetX=50
@@ -1028,6 +1002,7 @@ WarpOffsetX=60
TimeSignatureOffsetX=30
TickcountOffsetX=10
ComboOffsetX=30
+LabelOffsetX=80
[PlayerStageStats]
# Original CVS Grading
@@ -2350,10 +2325,10 @@ Mines,4="mod,attackmines;name,AttackMines"
# Mines,4="mod,attackmines;name,AttackMines"
Attacks="3"
-AttacksDefault="mod,no randomattacks,no songattacks"
-Attacks,1="name,Off"
+AttacksDefault="mod,songattacks"
+Attacks,3="mod,no randomattacks,no songattacks;name,Off"
Attacks,2="mod,randomattacks;name,RandomAttacks"
-Attacks,3="mod,songattacks;name,SongAttacks"
+Attacks,1="name,SongAttacks"
PlayerAutoPlay="2"
PlayerAutoPlayDefault="mod,no playerautoplay"
@@ -2741,8 +2716,9 @@ Line20="conf,VisualDelaySeconds"
Fallback="ScreenOptionsServiceChild"
NextScreen="ScreenOptionsExtended"
PrevScreen="ScreenOptionsExtended"
-LineNames="2,3,4,8,11,13,14,15,16,28,29,30"
-Line2="conf,ScoringType"
+LineNames="Score,3,4,8,11,13,14,15,16,28,29,30"
+#Line2="conf,ScoringType"
+LineScore="lua,UserPrefScoringMode()"
Line3="conf,TimingWindowScale"
Line4="conf,LifeDifficulty"
Line8="lua,GamePrefDefaultFail()"
@@ -3691,7 +3667,7 @@ CancelTransitionsOut=true
PlayMusic=false
TimerSeconds=-1
ShowStyleIcon=false
-LineNames="1,2,3,4,5,6,R,7,8,9,10,11,12,13,14,15,16"
+LineNames="1,2,3,4,5,6,R,7,8,9,10,Attacks,11,12,13,14,15,16"
Line1="list,Speed"
Line2="list,Accel"
Line3="list,Effect"
@@ -3703,6 +3679,7 @@ Line7="list,Scroll"
Line8="list,NoteSkins"
Line9="list,Holds"
Line10="list,Mines"
+LineAttacks="list,Attacks"
Line11="list,Hide"
Line12="list,Persp"
Line13="list,Assist"
@@ -4249,4 +4226,4 @@ TimerSeconds=40
TimerStealth=true
ForceTimer=true
TimerMetricsGroup="MenuTimerNoSound"
-TimerOnCommand=visible,false
\ No newline at end of file
+TimerOnCommand=visible,false
diff --git a/Themes/_portKit-sm4/metrics.ini b/Themes/_portKit-sm4/metrics.ini
index d8f9ca94c6..9bd0f54a35 100644
--- a/Themes/_portKit-sm4/metrics.ini
+++ b/Themes/_portKit-sm4/metrics.ini
@@ -4406,30 +4406,6 @@ BodyHeight=38
[ComboGraph]
BodyWidth=140
-[CustomScoring]
-ComboAboveThresholdAddsToScoreBonus=0
-ComboScoreBonusThreshold=50
-ComboScoreBonusValue=1000
-# this was removed in SM4
-ComboMultiplier=0.0
-
-DoubleNoteScoreMultiplier=1.0
-TripleNoteScoreMultiplier=1.0
-QuadOrHigherNoteScoreMultiplier=1.0
-
-PointsW1=1000
-PointsW2=1000
-PointsW3=500
-PointsW4=100
-PointsW5=-200
-PointsMiss=-500
-PointsHitMine=-500
-PointsCheckpointHit=1000
-PointsCheckpointMiss=-200
-PointsNone=0
-PointsHoldHeld=1000
-PointsHoldLetGo=-500
-
[CustomDifficulty]
#See pump theme for an example
Names=""
diff --git a/Themes/_themekit-piu/metrics.ini b/Themes/_themekit-piu/metrics.ini
index 10e3f17d4b..e72fda4fc1 100644
--- a/Themes/_themekit-piu/metrics.ini
+++ b/Themes/_themekit-piu/metrics.ini
@@ -88,29 +88,6 @@ BackInEventMode=""
;Screwy
Names=""
-[CustomScoring]
-ComboAboveThresholdAddsToScoreBonus=0
-ComboMultiplier=0.0
-ComboScoreBonusThreshold=50
-ComboScoreBonusValue=+1000
-
-DoubleNoteScoreMultiplier=1.0
-TripleNoteScoreMultiplier=1.5
-QuadOrHigherNoteScoreMultiplier=2
-
-PointsW1=+1000
-PointsW2=+1000
-PointsW3=+500
-PointsW4=+100
-PointsW5=-200
-PointsMiss=-500
-PointsHitMine=-1000
-PointsCheckpointHit=+1000
-PointsCheckpointMiss=-200
-PointsNone=0
-PointsHoldHeld=+1000
-PointsHoldLetGo=-500
-
[Gameplay]
ComboIsPerRow=true
MinScoreToContinueCombo="TapNoteScore_W3"
@@ -550,4 +527,4 @@ PrevScreen="ScreenTitleMenu"
[ScreenOptionsSystemDirection]
Fallback="ScreenOptionsServiceChild"
PrevScreen="ScreenOptionsService"
-NextScreen="ScreenOptionsService"
\ No newline at end of file
+NextScreen="ScreenOptionsService"
diff --git a/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua b/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua
index c86d6323b6..f46c102f86 100644
--- a/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua
+++ b/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua
@@ -168,11 +168,13 @@ t[#t+1] = Def.ActorFrame {
};
CreateStops();
};
-if PREFSMAN:GetPreference("ScoringType") == 'ScoringType_Custom' then
- t[#t+1] = Def.Actor{
- JudgmentMessageCommand = function(self, params)
- SpecialScoring[GetUserPref("UserPrefSpecialScoringMode")](params, STATSMAN:GetCurStageStats():GetPlayerStageStats(params.Player))
- end;
- };
+if( not GAMESTATE:IsCourseMode() ) then
+t[#t+1] = Def.Actor{
+ JudgmentMessageCommand = function(self, params)
+ Scoring[GetUserPref("UserPrefScoringMode")](params,
+ STATSMAN:GetCurStageStats():GetPlayerStageStats(params.Player))
+ end;
+};
end;
+
return t
diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini
index 1afd38fa53..c8212a7ed7 100644
--- a/Themes/default/Languages/en.ini
+++ b/Themes/default/Languages/en.ini
@@ -78,7 +78,6 @@ TimingDifficulty=Timing Difficulty: %s
[OptionTitles]
UserPrefAutoSetStyle=Auto Set Style
-UserPrefSpecialScoringMode=Special Scoring Mode
UserPrefNotePosition=Note Positions
UserPrefComboOnRolls=Rolls Increment Combo
UserPrefComboUnderField=Combo Under Field
@@ -97,7 +96,6 @@ UserPrefComboOnRolls=Choose if rolls should increment the combo or not.
UserPrefComboUnderField=Determine if the combo should display under the notes or not.
UserPrefGameplayShowScore=Show or Hide the score display in gameplay.
-UserPrefSpecialScoringMode=Select the scoring mode to be used if the Special scoring type is selected.
UserPrefGameplayShowStepsDisplay=Show or Hide the step information display in gameplay.
UserPrefShowLotsaOptions=Choose how many lines/rows of options to choose from. &oq;Few&cq; keeps the list to a minimum. &oq;Many&cq; adds various show-off mods.
UserPrefLongFail=Choose between the original sm-ssc fail (Long) or the new sm-ssc fail (Short).
diff --git a/Themes/default/Scripts/03 ThemePrefs.lua b/Themes/default/Scripts/03 ThemePrefs.lua
index 86da78bb68..f3b91da4e3 100644
--- a/Themes/default/Scripts/03 ThemePrefs.lua
+++ b/Themes/default/Scripts/03 ThemePrefs.lua
@@ -21,8 +21,8 @@ function InitUserPrefs()
if GetUserPref("UserPrefGameplayShowScore") == nil then
SetUserPref("UserPrefGameplayShowScore", false);
end;
- if GetUserPref("UserPrefSpecialScoringMode") == nil then
- SetUserPref("UserPrefSpecialScoringMode", 'DDR 1st Mix');
+ if GetUserPref("UserPrefScoringMode") == nil then
+ SetUserPref("UserPrefScoringMode", 'DDR Extreme');
end;
if GetUserPrefB("UserPrefShowLotsaOptions") == nil then
SetUserPref("UserPrefShowLotsaOptions", true);
@@ -230,34 +230,6 @@ function UserPrefShowLotsaOptions()
return t;
end
-function UserPrefSpecialScoringMode()
- local baseChoices = { 'DDR 1stMIX', 'DDR 4thMIX', 'DDR SuperNOVA', 'DDR SuperNOVA 2', 'MIGS' }; --'[SSC] Radar Master'
- local t = {
- Name = "UserPrefSpecialScoringMode";
- LayoutType = "ShowAllInRow";
- SelectType = "SelectOne";
- OneChoiceForAllPlayers = true;
- ExportOnChange = false;
- Choices = baseChoices;
- LoadSelections = function(self, list, pn)
- if ReadPrefFromFile("UserPrefSpecialScoringMode") ~= nil then
- local theValue = ReadPrefFromFile("UserPrefSpecialScoringMode");
- local success = false;
- for k,v in ipairs(baseChoices) do if v == theValue then list[k] = true success = true break end end;
- if success == false then list[1] = true end;
- else
- WritePrefToFile("UserPrefSpecialScoringMode", 'DDR 1stMIX');
- list[1] = true;
- end;
- end;
- SaveSelections = function(self, list, pn)
- for k,v in ipairs(list) do if v then WritePrefToFile("UserPrefSpecialScoringMode", baseChoices[k]) break end end;
- end;
- };
- setmetatable( t, t );
- return t;
-end
-
function GetDefaultOptionLines()
local LineSets = {
"1,8,14,2,3,4,5,6,R,7,9,10,11,12,13,15,16,17,18", -- All
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index a9931ae5f6..71636f5de9 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -107,28 +107,6 @@ TextPulseCommand=finishtweening;diffusealpha,1;zoom,0.5*1.025;decelerate,0.05;zo
[CustomDifficulty]
-[CustomScoring]
-# So special scoring works properly, we zero this out
-ComboAboveThresholdAddsToScoreBonus=0
-ComboScoreBonusThreshold=0
-ComboScoreBonusValue=0
-ComboMultiplier=0
-DoubleNoteScoreMultiplier=0
-TripleNoteScoreMultiplier=0
-QuadOrHigherNoteScoreMultiplier=0
-PointsW1=0
-PointsW2=0
-PointsW3=0
-PointsW4=0
-PointsW5=0
-PointsMiss=0
-PointsHitMine=0
-PointsCheckpointHit=0
-PointsCheckpointMiss=0
-PointsNone=0
-PointsHoldHeld=0
-PointsHoldLetGo=0
-
[DifficultyList]
ItemsSpacingY=24
NumShownItems=8
@@ -1252,7 +1230,7 @@ LineFlashyCombo="lua,UserPrefFlashyCombo()"
[ScreenOptionsGraphicsSound]
[ScreenOptionsAdvanced]
-LineNames="2,3,4,8,11,13,14,15,16,28,29,30,RollCombo"
+LineNames="Score,3,4,8,11,13,14,15,16,28,29,30,RollCombo"
LineRollCombo="lua,UserPrefComboOnRolls()"
[ScreenAppearanceOptions]
@@ -1267,10 +1245,9 @@ LineRollCombo="lua,UserPrefComboOnRolls()"
Fallback="ScreenOptionsServiceChild"
NextScreen="ScreenOptionsExtended"
PrevScreen="ScreenOptionsExtended"
-LineNames="gNotePos,gAuto,gScore,gSScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter"
+LineNames="gNotePos,gAuto,gScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter"
LinegNotePos="lua,UserPrefNotePosition()"
LinegScore="lua,UserPrefGameplayShowScore()"
-LinegSScore="lua,UserPrefSpecialScoringMode()"
LinegSDisp="lua,UserPrefGameplayShowStepsDisplay()"
LinegOpts="lua,UserPrefShowLotsaOptions()"
LinegAuto="lua,UserPrefAutoSetStyle()"
diff --git a/Themes/themekit/Graphics/MusicWheelItem Song ColorPart.lua b/Themes/themekit/Graphics/MusicWheelItem Song ColorPart.lua
new file mode 100644
index 0000000000..d3d0df30f3
--- /dev/null
+++ b/Themes/themekit/Graphics/MusicWheelItem Song ColorPart.lua
@@ -0,0 +1,14 @@
+return Def.ActorFrame {
+ Def.Quad {
+ InitCommand=cmd(x,-128+4;zoomto,4,46);
+-- OnCommand=cmd(diffuse,color("0,0,0,0.5"));
+ };
+--[[ Def.Quad {
+ InitCommand=cmd(x,-128+16+6;zoomto,32,46);
+-- OnCommand=cmd(faderight,1;diffusealpha,0.5);
+ }; --]]
+--[[ Def.Quad {
+ InitCommand=cmd(x,2;y,23;zoomto,320,1);
+-- OnCommand=cmd(diffuse,color("0,0,0,0.5"));
+ }; --]]
+};
\ No newline at end of file
diff --git a/Themes/themekit/Graphics/MusicWheelItem Song NormalPart.lua b/Themes/themekit/Graphics/MusicWheelItem Song NormalPart.lua
new file mode 100644
index 0000000000..7c5b876099
--- /dev/null
+++ b/Themes/themekit/Graphics/MusicWheelItem Song NormalPart.lua
@@ -0,0 +1,6 @@
+return Def.ActorFrame {
+ Def.Quad {
+ InitCommand=cmd(x,4;zoomto,256-4,46);
+ OnCommand=cmd(diffuse,color("0,0,0,0.5"));
+ };
+};
\ No newline at end of file
diff --git a/Utils/Font generation/smfontgen.py b/Utils/Font generation/smfontgen.py
index a0011749bd..3219366853 100644
--- a/Utils/Font generation/smfontgen.py
+++ b/Utils/Font generation/smfontgen.py
@@ -12,7 +12,7 @@ def smfontgen(fontname, fontsize, glyphsizex, glyphsizey, sstartcode, sendcode,
texindex = 0
metricsfd = 0
atglyph = startcode
-
+
metrics = open(filename+".ini", "w")
metrics.write("\xEF\xBB\xBF") # Unicode BOM
metrics.write("[common]\n")
@@ -24,7 +24,7 @@ def smfontgen(fontname, fontsize, glyphsizex, glyphsizey, sstartcode, sendcode,
metrics.write("DrawExtraPixelsRight=0\n")
metrics.write("AdvanceExtraPixels=0\n")
metrics.write("\n")
-
+
while(atglyph <= endcode):
atglyph = maketex(texindex, fontname, fontsize, glyphsizex, glyphsizey, atglyph, endcode, charsperrow, rowspertex, metrics, border, filename)
texindex+=1
@@ -34,9 +34,9 @@ def smfontgen(fontname, fontsize, glyphsizex, glyphsizey, sstartcode, sendcode,
def maketex(texindex, fontname, fontsize, glyphsizex, glyphsizey, startcode, endcode, charsperrow, rowspertex, metrics, border, filename):
totalx = glyphsizex * charsperrow # We'll crop it down later if needed
totaly = glyphsizey*rowspertex # See above
-
+
metrics.write("["+str(texindex)+"]\n")
-
+
img = pdb.gimp_image_new(totalx, totaly, RGB)
# DEBUG: show the image
#pdb.gimp_display_new(img)
@@ -69,7 +69,7 @@ def maketex(texindex, fontname, fontsize, glyphsizex, glyphsizey, startcode, end
pdb.gimp_selection_layer_alpha(charlyr)
# Merge the layer down (the selection stays):
glyphlyr = pdb.gimp_image_merge_down(img, charlyr, CLIP_TO_IMAGE)
-
+
# And finally, test if the selection is empty. If it is, there's no glyph.
# If it isn't, we got a glyph.
# If no floating selection was created, nothing was drawn,
@@ -87,9 +87,9 @@ def maketex(texindex, fontname, fontsize, glyphsizex, glyphsizey, startcode, end
if celly >= rowspertex: break
metrics.write("\n")
metrics.write("Line "+str(celly)+"=")
-
+
atglyph+=1
-
+
# If we didn't use all the rows/columns, crop off the excess
if(celly == 0): # Only one row
assert atglyph >= endcode
@@ -97,9 +97,9 @@ def maketex(texindex, fontname, fontsize, glyphsizex, glyphsizey, startcode, end
elif ( (celly+1)*glyphsizey < totaly):
assert atglyph >= endcode
pdb.gimp_image_crop(img, totalx, (celly+1)*glyphsizey, 0, 0)
-
+
# Here is where you put your code for dressing the glyphs up. gimp_selection_layer_alpha is your friend.
-
+
# Outline
#otlnlyr = pdb.gimp_layer_copy(glyphlyr, False)
#pdb.gimp_drawable_set_name(otlnlyr, "Outlines")
@@ -108,10 +108,10 @@ def maketex(texindex, fontname, fontsize, glyphsizex, glyphsizey, startcode, end
#pdb.gimp_selection_layer_alpha(otlnlyr)
#pdb.gimp_selection_grow(img, 3)
#pdb.gimp_edit_bucket_fill(otlnlyr, BG_BUCKET_FILL, NORMAL_MODE,100, 255, False, 0, 0)
-
+
# Rename the ("new") glyph layer
pdb.gimp_drawable_set_name(glyphlyr, "Glyphs")
-
+
# Save the texture.
if(celly == rowspertex): # Full texture
finalfilename = filename+" ["+str(texindex)+"] "+str(charsperrow)+"x"+str(rowspertex)+".png"
@@ -119,21 +119,21 @@ def maketex(texindex, fontname, fontsize, glyphsizex, glyphsizey, startcode, end
finalfilename = filename+" ["+str(texindex)+"] "+str(charsperrow)+"x"+str(celly+1)+".png"
else: # Only one row
finalfilename = filename+" ["+str(texindex)+"] "+str(cellx+1)+"x1.png"
-
+
drwbl = pdb.gimp_image_merge_visible_layers(img, CLIP_TO_IMAGE)
pdb.gimp_file_save(img, drwbl, finalfilename, finalfilename)
-
+
# All saved up. Blow it out of RAM.
pdb.gimp_image_delete(img)
-
+
# Wrap up metrics for this tex.
metrics.write("\n")
metrics.write("\n")
metrics.write(charlenout)
metrics.write("\n")
-
+
charlenout = ""
-
+
return atglyph
register(
@@ -161,4 +161,4 @@ register(
smfontgen,
"/File/Create/Misc/")
-main()
\ No newline at end of file
+main()
diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj
index 71d0d4bc05..7f4bc6c9ad 100644
--- a/Xcode/stepmania.xcodeproj/project.pbxproj
+++ b/Xcode/stepmania.xcodeproj/project.pbxproj
@@ -31,6 +31,68 @@
2BA7925F1304F20D002BD8E1 /* NotesLoaderSSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BA7925B1304F20D002BD8E1 /* NotesLoaderSSC.h */; };
2BA792601304F20D002BD8E1 /* NotesWriterSSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BA7925C1304F20D002BD8E1 /* NotesWriterSSC.cpp */; };
2BA792611304F20D002BD8E1 /* NotesWriterSSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BA7925D1304F20D002BD8E1 /* NotesWriterSSC.h */; };
+ 2BD06FEE137242680018CB9F /* json_batchallocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BD06FDD137240CF0018CB9F /* json_batchallocator.h */; };
+ 2BD06FEF137242680018CB9F /* json_internalarray.inl in Resources */ = {isa = PBXBuildFile; fileRef = 2BD06FDE137240CF0018CB9F /* json_internalarray.inl */; };
+ 2BD06FF0137242680018CB9F /* json_internalmap.inl in Resources */ = {isa = PBXBuildFile; fileRef = 2BD06FDF137240CF0018CB9F /* json_internalmap.inl */; };
+ 2BD06FF1137242680018CB9F /* json_reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BD06FE0137240CF0018CB9F /* json_reader.cpp */; };
+ 2BD06FF2137242680018CB9F /* json_value.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BD06FE1137240CF0018CB9F /* json_value.cpp */; };
+ 2BD06FF3137242680018CB9F /* json_valueiterator.inl in Resources */ = {isa = PBXBuildFile; fileRef = 2BD06FE2137240CF0018CB9F /* json_valueiterator.inl */; };
+ 2BD06FF4137242680018CB9F /* json_writer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BD06FE3137240CF0018CB9F /* json_writer.cpp */; };
+ 2BDB88E9137201F700E6FD3A /* lapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88B2137201F700E6FD3A /* lapi.c */; };
+ 2BDB88EA137201F700E6FD3A /* lapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88B3137201F700E6FD3A /* lapi.h */; };
+ 2BDB88EB137201F700E6FD3A /* lauxlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88B4137201F700E6FD3A /* lauxlib.c */; };
+ 2BDB88EC137201F700E6FD3A /* lauxlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88B5137201F700E6FD3A /* lauxlib.h */; };
+ 2BDB88ED137201F700E6FD3A /* lbaselib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88B6137201F700E6FD3A /* lbaselib.c */; };
+ 2BDB88EE137201F700E6FD3A /* lcode.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88B7137201F700E6FD3A /* lcode.c */; };
+ 2BDB88EF137201F700E6FD3A /* lcode.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88B8137201F700E6FD3A /* lcode.h */; };
+ 2BDB88F0137201F700E6FD3A /* ldblib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88B9137201F700E6FD3A /* ldblib.c */; };
+ 2BDB88F1137201F700E6FD3A /* ldebug.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88BA137201F700E6FD3A /* ldebug.c */; };
+ 2BDB88F2137201F700E6FD3A /* ldebug.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88BB137201F700E6FD3A /* ldebug.h */; };
+ 2BDB88F3137201F700E6FD3A /* ldo.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88BC137201F700E6FD3A /* ldo.c */; };
+ 2BDB88F4137201F700E6FD3A /* ldo.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88BD137201F700E6FD3A /* ldo.h */; };
+ 2BDB88F5137201F700E6FD3A /* ldump.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88BE137201F700E6FD3A /* ldump.c */; };
+ 2BDB88F6137201F700E6FD3A /* lfunc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88BF137201F700E6FD3A /* lfunc.c */; };
+ 2BDB88F7137201F700E6FD3A /* lfunc.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88C0137201F700E6FD3A /* lfunc.h */; };
+ 2BDB88F8137201F700E6FD3A /* lgc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88C1137201F700E6FD3A /* lgc.c */; };
+ 2BDB88F9137201F700E6FD3A /* lgc.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88C2137201F700E6FD3A /* lgc.h */; };
+ 2BDB88FA137201F700E6FD3A /* linit.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88C3137201F700E6FD3A /* linit.c */; };
+ 2BDB88FB137201F700E6FD3A /* liolib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88C4137201F700E6FD3A /* liolib.c */; };
+ 2BDB88FC137201F700E6FD3A /* llex.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88C5137201F700E6FD3A /* llex.c */; };
+ 2BDB88FD137201F700E6FD3A /* llex.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88C6137201F700E6FD3A /* llex.h */; };
+ 2BDB88FE137201F700E6FD3A /* llimits.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88C7137201F700E6FD3A /* llimits.h */; };
+ 2BDB88FF137201F700E6FD3A /* lmathlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88C8137201F700E6FD3A /* lmathlib.c */; };
+ 2BDB8900137201F700E6FD3A /* lmem.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88C9137201F700E6FD3A /* lmem.c */; };
+ 2BDB8901137201F700E6FD3A /* lmem.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88CA137201F700E6FD3A /* lmem.h */; };
+ 2BDB8902137201F700E6FD3A /* loadlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88CB137201F700E6FD3A /* loadlib.c */; };
+ 2BDB8903137201F700E6FD3A /* lobject.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88CC137201F700E6FD3A /* lobject.c */; };
+ 2BDB8904137201F700E6FD3A /* lobject.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88CD137201F700E6FD3A /* lobject.h */; };
+ 2BDB8905137201F700E6FD3A /* lopcodes.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88CE137201F700E6FD3A /* lopcodes.c */; };
+ 2BDB8906137201F700E6FD3A /* lopcodes.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88CF137201F700E6FD3A /* lopcodes.h */; };
+ 2BDB8907137201F700E6FD3A /* loslib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88D0137201F700E6FD3A /* loslib.c */; };
+ 2BDB8908137201F700E6FD3A /* lparser.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88D1137201F700E6FD3A /* lparser.c */; };
+ 2BDB8909137201F700E6FD3A /* lparser.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88D2137201F700E6FD3A /* lparser.h */; };
+ 2BDB890A137201F700E6FD3A /* lstate.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88D3137201F700E6FD3A /* lstate.c */; };
+ 2BDB890B137201F700E6FD3A /* lstate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88D4137201F700E6FD3A /* lstate.h */; };
+ 2BDB890C137201F700E6FD3A /* lstring.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88D5137201F700E6FD3A /* lstring.c */; };
+ 2BDB890D137201F700E6FD3A /* lstring.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88D6137201F700E6FD3A /* lstring.h */; };
+ 2BDB890E137201F700E6FD3A /* lstrlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88D7137201F700E6FD3A /* lstrlib.c */; };
+ 2BDB890F137201F700E6FD3A /* ltable.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88D8137201F700E6FD3A /* ltable.c */; };
+ 2BDB8910137201F700E6FD3A /* ltable.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88D9137201F700E6FD3A /* ltable.h */; };
+ 2BDB8911137201F700E6FD3A /* ltablib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88DA137201F700E6FD3A /* ltablib.c */; };
+ 2BDB8912137201F700E6FD3A /* ltm.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88DB137201F700E6FD3A /* ltm.c */; };
+ 2BDB8913137201F700E6FD3A /* ltm.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88DC137201F700E6FD3A /* ltm.h */; };
+ 2BDB8914137201F700E6FD3A /* lua.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88DD137201F700E6FD3A /* lua.c */; };
+ 2BDB8915137201F700E6FD3A /* lua.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88DE137201F700E6FD3A /* lua.h */; };
+ 2BDB8916137201F700E6FD3A /* luac.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88DF137201F700E6FD3A /* luac.c */; };
+ 2BDB8917137201F700E6FD3A /* luaconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88E0137201F700E6FD3A /* luaconf.h */; };
+ 2BDB8918137201F700E6FD3A /* lualib.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88E1137201F700E6FD3A /* lualib.h */; };
+ 2BDB8919137201F700E6FD3A /* lundump.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88E2137201F700E6FD3A /* lundump.c */; };
+ 2BDB891A137201F700E6FD3A /* lundump.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88E3137201F700E6FD3A /* lundump.h */; };
+ 2BDB891B137201F700E6FD3A /* lvm.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88E4137201F700E6FD3A /* lvm.c */; };
+ 2BDB891C137201F700E6FD3A /* lvm.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88E5137201F700E6FD3A /* lvm.h */; };
+ 2BDB891D137201F700E6FD3A /* lzio.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88E6137201F700E6FD3A /* lzio.c */; };
+ 2BDB891E137201F700E6FD3A /* lzio.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BDB88E7137201F700E6FD3A /* lzio.h */; };
+ 2BDB891F137201F700E6FD3A /* print.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BDB88E8137201F700E6FD3A /* print.c */; };
3659B56F0F902143002B6B68 /* CommandLineActions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3659B56D0F902143002B6B68 /* CommandLineActions.cpp */; };
3659B5700F902143002B6B68 /* CommandLineActions.h in Headers */ = {isa = PBXBuildFile; fileRef = 3659B56E0F902143002B6B68 /* CommandLineActions.h */; };
367D575B0EDE56F200B46814 /* ScreenHighScores.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 367D57590EDE56F200B46814 /* ScreenHighScores.cpp */; };
@@ -1052,11 +1114,8 @@
AA77E76508B64B9A00FA24CA /* ScreenOptionsManageCourses.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA77E75B08B64B9A00FA24CA /* ScreenOptionsManageCourses.cpp */; };
AA77E76708B64B9A00FA24CA /* ScreenOptionsManageProfiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA77E75D08B64B9A00FA24CA /* ScreenOptionsManageProfiles.cpp */; };
AA77E8B108B6ABD500FA24CA /* vecLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA77E8A108B6ABD500FA24CA /* vecLib.framework */; };
- AA7A2BA00AE09BC90054C5BA /* lua.c in Sources */ = {isa = PBXBuildFile; fileRef = AA7A2B9D0AE09BC80054C5BA /* lua.c */; };
AA7A2BAF0AE09CEC0054C5BA /* liblua-5.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAE7817E0AC7E37B00AEFC64 /* liblua-5.1.a */; };
AA7A2BB00AE09CF10054C5BA /* liblua-5.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAE7817E0AC7E37B00AEFC64 /* liblua-5.1.a */; };
- AA7A2BB10AE09CF80054C5BA /* print.c in Sources */ = {isa = PBXBuildFile; fileRef = AA7A2B9F0AE09BC90054C5BA /* print.c */; };
- AA7A2BB20AE09CF90054C5BA /* luac.c in Sources */ = {isa = PBXBuildFile; fileRef = AA7A2B9E0AE09BC90054C5BA /* luac.c */; };
AA7ADC27072CAB7F00C50A7F /* RageSoundReader_Chain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA7ADC23072CAB7F00C50A7F /* RageSoundReader_Chain.cpp */; };
AA7ADC29072CAB7F00C50A7F /* RageSoundUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA7ADC25072CAB7F00C50A7F /* RageSoundUtil.cpp */; };
AA7C8AFC0B6744F700FD9940 /* bn_error.c in Sources */ = {isa = PBXBuildFile; fileRef = AA7C8A800B6744F600FD9940 /* bn_error.c */; };
@@ -1525,58 +1584,6 @@
AAE7804B060814AC0034E65F /* NetworkSyncManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAE78049060814AC0034E65F /* NetworkSyncManager.cpp */; };
AAE7808706081A000034E65F /* ezsockets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAE7808506081A000034E65F /* ezsockets.cpp */; };
AAE7812D0608249E0034E65F /* ActiveAttackList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAE7812B0608249E0034E65F /* ActiveAttackList.cpp */; };
- AAE781BF0AC7E53500AEFC64 /* lapi.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE7818B0AC7E53400AEFC64 /* lapi.c */; };
- AAE781C00AC7E53500AEFC64 /* lapi.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE7818C0AC7E53400AEFC64 /* lapi.h */; };
- AAE781C10AC7E53500AEFC64 /* lauxlib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE7818D0AC7E53400AEFC64 /* lauxlib.c */; };
- AAE781C20AC7E53500AEFC64 /* lauxlib.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE7818E0AC7E53400AEFC64 /* lauxlib.h */; };
- AAE781C30AC7E53500AEFC64 /* lbaselib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE7818F0AC7E53400AEFC64 /* lbaselib.c */; };
- AAE781C40AC7E53500AEFC64 /* lcode.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781900AC7E53400AEFC64 /* lcode.c */; };
- AAE781C50AC7E53500AEFC64 /* lcode.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781910AC7E53400AEFC64 /* lcode.h */; };
- AAE781C60AC7E53500AEFC64 /* ldblib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781920AC7E53400AEFC64 /* ldblib.c */; };
- AAE781C70AC7E53500AEFC64 /* ldebug.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781930AC7E53400AEFC64 /* ldebug.c */; };
- AAE781C80AC7E53500AEFC64 /* ldebug.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781940AC7E53400AEFC64 /* ldebug.h */; };
- AAE781C90AC7E53500AEFC64 /* ldo.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781950AC7E53400AEFC64 /* ldo.c */; };
- AAE781CA0AC7E53500AEFC64 /* ldo.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781960AC7E53400AEFC64 /* ldo.h */; };
- AAE781CB0AC7E53500AEFC64 /* ldump.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781970AC7E53400AEFC64 /* ldump.c */; };
- AAE781CC0AC7E53500AEFC64 /* lfunc.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781980AC7E53400AEFC64 /* lfunc.c */; };
- AAE781CD0AC7E53500AEFC64 /* lfunc.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781990AC7E53400AEFC64 /* lfunc.h */; };
- AAE781CE0AC7E53500AEFC64 /* lgc.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE7819A0AC7E53400AEFC64 /* lgc.c */; };
- AAE781CF0AC7E53500AEFC64 /* lgc.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE7819B0AC7E53400AEFC64 /* lgc.h */; };
- AAE781D00AC7E53500AEFC64 /* linit.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE7819C0AC7E53400AEFC64 /* linit.c */; };
- AAE781D10AC7E53500AEFC64 /* liolib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE7819D0AC7E53400AEFC64 /* liolib.c */; };
- AAE781D20AC7E53500AEFC64 /* llex.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE7819E0AC7E53400AEFC64 /* llex.c */; };
- AAE781D30AC7E53500AEFC64 /* llex.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE7819F0AC7E53400AEFC64 /* llex.h */; };
- AAE781D40AC7E53500AEFC64 /* llimits.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781A00AC7E53400AEFC64 /* llimits.h */; };
- AAE781D50AC7E53500AEFC64 /* lmathlib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781A10AC7E53400AEFC64 /* lmathlib.c */; };
- AAE781D60AC7E53500AEFC64 /* lmem.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781A20AC7E53400AEFC64 /* lmem.c */; };
- AAE781D70AC7E53500AEFC64 /* lmem.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781A30AC7E53400AEFC64 /* lmem.h */; };
- AAE781D80AC7E53500AEFC64 /* loadlib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781A40AC7E53400AEFC64 /* loadlib.c */; };
- AAE781D90AC7E53500AEFC64 /* lobject.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781A50AC7E53400AEFC64 /* lobject.c */; };
- AAE781DA0AC7E53500AEFC64 /* lobject.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781A60AC7E53400AEFC64 /* lobject.h */; };
- AAE781DB0AC7E53500AEFC64 /* lopcodes.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781A70AC7E53400AEFC64 /* lopcodes.c */; };
- AAE781DC0AC7E53500AEFC64 /* lopcodes.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781A80AC7E53400AEFC64 /* lopcodes.h */; };
- AAE781DD0AC7E53500AEFC64 /* loslib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781A90AC7E53400AEFC64 /* loslib.c */; };
- AAE781DE0AC7E53500AEFC64 /* lparser.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781AA0AC7E53400AEFC64 /* lparser.c */; };
- AAE781DF0AC7E53500AEFC64 /* lparser.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781AB0AC7E53400AEFC64 /* lparser.h */; };
- AAE781E00AC7E53500AEFC64 /* lstate.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781AC0AC7E53400AEFC64 /* lstate.c */; };
- AAE781E10AC7E53500AEFC64 /* lstate.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781AD0AC7E53400AEFC64 /* lstate.h */; };
- AAE781E20AC7E53500AEFC64 /* lstring.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781AE0AC7E53400AEFC64 /* lstring.c */; };
- AAE781E30AC7E53500AEFC64 /* lstring.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781AF0AC7E53400AEFC64 /* lstring.h */; };
- AAE781E40AC7E53500AEFC64 /* lstrlib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781B00AC7E53400AEFC64 /* lstrlib.c */; };
- AAE781E50AC7E53500AEFC64 /* ltable.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781B10AC7E53400AEFC64 /* ltable.c */; };
- AAE781E60AC7E53500AEFC64 /* ltable.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781B20AC7E53400AEFC64 /* ltable.h */; };
- AAE781E70AC7E53500AEFC64 /* ltablib.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781B30AC7E53400AEFC64 /* ltablib.c */; };
- AAE781E80AC7E53500AEFC64 /* ltm.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781B40AC7E53400AEFC64 /* ltm.c */; };
- AAE781E90AC7E53500AEFC64 /* ltm.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781B50AC7E53400AEFC64 /* ltm.h */; };
- AAE781EA0AC7E53500AEFC64 /* lua.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781B60AC7E53400AEFC64 /* lua.h */; };
- AAE781EB0AC7E53500AEFC64 /* luaconf.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781B70AC7E53400AEFC64 /* luaconf.h */; };
- AAE781EC0AC7E53500AEFC64 /* lualib.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781B80AC7E53400AEFC64 /* lualib.h */; };
- AAE781ED0AC7E53500AEFC64 /* lundump.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781B90AC7E53400AEFC64 /* lundump.c */; };
- AAE781EE0AC7E53500AEFC64 /* lundump.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781BA0AC7E53400AEFC64 /* lundump.h */; };
- AAE781EF0AC7E53500AEFC64 /* lvm.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781BB0AC7E53400AEFC64 /* lvm.c */; };
- AAE781F00AC7E53500AEFC64 /* lvm.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781BC0AC7E53400AEFC64 /* lvm.h */; };
- AAE781F10AC7E53500AEFC64 /* lzio.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE781BD0AC7E53400AEFC64 /* lzio.c */; };
- AAE781F20AC7E53500AEFC64 /* lzio.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE781BE0AC7E53400AEFC64 /* lzio.h */; };
AAE782030AC7E64D00AEFC64 /* liblua-5.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAE7817E0AC7E37B00AEFC64 /* liblua-5.1.a */; };
AAE782040AC7E65200AEFC64 /* liblua-5.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAE7817E0AC7E37B00AEFC64 /* liblua-5.1.a */; };
AAEBC6CC07A20AFE00793F0E /* RageSurface_Save_JPEG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAEBC6C607A20AFE00793F0E /* RageSurface_Save_JPEG.cpp */; };
@@ -1635,13 +1642,6 @@
EE879BC3132E06C50078FDDC /* glew.c in Sources */ = {isa = PBXBuildFile; fileRef = EE879BAA132E06C50078FDDC /* glew.c */; };
EE906F6612BF3A1B00146C96 /* ScreenInstallOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F6412BF3A1B00146C96 /* ScreenInstallOverlay.cpp */; };
EE906F6712BF3A1B00146C96 /* ScreenInstallOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = EE906F6512BF3A1B00146C96 /* ScreenInstallOverlay.h */; };
- EE906F7712BF3A6900146C96 /* json_batchallocator.h in Headers */ = {isa = PBXBuildFile; fileRef = EE906F7012BF3A6900146C96 /* json_batchallocator.h */; };
- EE906F7812BF3A6900146C96 /* json_internalarray.inl in Resources */ = {isa = PBXBuildFile; fileRef = EE906F7112BF3A6900146C96 /* json_internalarray.inl */; };
- EE906F7912BF3A6900146C96 /* json_internalmap.inl in Resources */ = {isa = PBXBuildFile; fileRef = EE906F7212BF3A6900146C96 /* json_internalmap.inl */; };
- EE906F7A12BF3A6900146C96 /* json_reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F7312BF3A6900146C96 /* json_reader.cpp */; };
- EE906F7B12BF3A6900146C96 /* json_value.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F7412BF3A6900146C96 /* json_value.cpp */; };
- EE906F7C12BF3A6900146C96 /* json_valueiterator.inl in Resources */ = {isa = PBXBuildFile; fileRef = EE906F7512BF3A6900146C96 /* json_valueiterator.inl */; };
- EE906F7D12BF3A6900146C96 /* json_writer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F7612BF3A6900146C96 /* json_writer.cpp */; };
EE906F8212BF3AF800146C96 /* JsonUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F8012BF3AF800146C96 /* JsonUtil.cpp */; };
EE906F8312BF3AF800146C96 /* JsonUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = EE906F8112BF3AF800146C96 /* JsonUtil.h */; };
EE906F8A12BF3C7C00146C96 /* FileDownload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F8812BF3C7C00146C96 /* FileDownload.cpp */; };
@@ -1782,6 +1782,68 @@
2BA7925B1304F20D002BD8E1 /* NotesLoaderSSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NotesLoaderSSC.h; path = ../src/NotesLoaderSSC.h; sourceTree = SOURCE_ROOT; };
2BA7925C1304F20D002BD8E1 /* NotesWriterSSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NotesWriterSSC.cpp; path = ../src/NotesWriterSSC.cpp; sourceTree = SOURCE_ROOT; };
2BA7925D1304F20D002BD8E1 /* NotesWriterSSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NotesWriterSSC.h; path = ../src/NotesWriterSSC.h; sourceTree = SOURCE_ROOT; };
+ 2BD06FDD137240CF0018CB9F /* json_batchallocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json_batchallocator.h; path = ../extern/jsoncpp/src/lib_json/json_batchallocator.h; sourceTree = SOURCE_ROOT; };
+ 2BD06FDE137240CF0018CB9F /* json_internalarray.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json_internalarray.inl; path = ../extern/jsoncpp/src/lib_json/json_internalarray.inl; sourceTree = SOURCE_ROOT; };
+ 2BD06FDF137240CF0018CB9F /* json_internalmap.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json_internalmap.inl; path = ../extern/jsoncpp/src/lib_json/json_internalmap.inl; sourceTree = SOURCE_ROOT; };
+ 2BD06FE0137240CF0018CB9F /* json_reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_reader.cpp; path = ../extern/jsoncpp/src/lib_json/json_reader.cpp; sourceTree = SOURCE_ROOT; };
+ 2BD06FE1137240CF0018CB9F /* json_value.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_value.cpp; path = ../extern/jsoncpp/src/lib_json/json_value.cpp; sourceTree = SOURCE_ROOT; };
+ 2BD06FE2137240CF0018CB9F /* json_valueiterator.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json_valueiterator.inl; path = ../extern/jsoncpp/src/lib_json/json_valueiterator.inl; sourceTree = SOURCE_ROOT; };
+ 2BD06FE3137240CF0018CB9F /* json_writer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_writer.cpp; path = ../extern/jsoncpp/src/lib_json/json_writer.cpp; sourceTree = SOURCE_ROOT; };
+ 2BDB88B2137201F700E6FD3A /* lapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lapi.c; path = "../extern/lua-5.1/src/lapi.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88B3137201F700E6FD3A /* lapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lapi.h; path = "../extern/lua-5.1/src/lapi.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88B4137201F700E6FD3A /* lauxlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lauxlib.c; path = "../extern/lua-5.1/src/lauxlib.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88B5137201F700E6FD3A /* lauxlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lauxlib.h; path = "../extern/lua-5.1/src/lauxlib.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88B6137201F700E6FD3A /* lbaselib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lbaselib.c; path = "../extern/lua-5.1/src/lbaselib.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88B7137201F700E6FD3A /* lcode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcode.c; path = "../extern/lua-5.1/src/lcode.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88B8137201F700E6FD3A /* lcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lcode.h; path = "../extern/lua-5.1/src/lcode.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88B9137201F700E6FD3A /* ldblib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldblib.c; path = "../extern/lua-5.1/src/ldblib.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88BA137201F700E6FD3A /* ldebug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldebug.c; path = "../extern/lua-5.1/src/ldebug.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88BB137201F700E6FD3A /* ldebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ldebug.h; path = "../extern/lua-5.1/src/ldebug.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88BC137201F700E6FD3A /* ldo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldo.c; path = "../extern/lua-5.1/src/ldo.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88BD137201F700E6FD3A /* ldo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ldo.h; path = "../extern/lua-5.1/src/ldo.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88BE137201F700E6FD3A /* ldump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldump.c; path = "../extern/lua-5.1/src/ldump.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88BF137201F700E6FD3A /* lfunc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lfunc.c; path = "../extern/lua-5.1/src/lfunc.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88C0137201F700E6FD3A /* lfunc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lfunc.h; path = "../extern/lua-5.1/src/lfunc.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88C1137201F700E6FD3A /* lgc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lgc.c; path = "../extern/lua-5.1/src/lgc.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88C2137201F700E6FD3A /* lgc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lgc.h; path = "../extern/lua-5.1/src/lgc.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88C3137201F700E6FD3A /* linit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = linit.c; path = "../extern/lua-5.1/src/linit.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88C4137201F700E6FD3A /* liolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = liolib.c; path = "../extern/lua-5.1/src/liolib.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88C5137201F700E6FD3A /* llex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = llex.c; path = "../extern/lua-5.1/src/llex.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88C6137201F700E6FD3A /* llex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = llex.h; path = "../extern/lua-5.1/src/llex.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88C7137201F700E6FD3A /* llimits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = llimits.h; path = "../extern/lua-5.1/src/llimits.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88C8137201F700E6FD3A /* lmathlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmathlib.c; path = "../extern/lua-5.1/src/lmathlib.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88C9137201F700E6FD3A /* lmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmem.c; path = "../extern/lua-5.1/src/lmem.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88CA137201F700E6FD3A /* lmem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lmem.h; path = "../extern/lua-5.1/src/lmem.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88CB137201F700E6FD3A /* loadlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loadlib.c; path = "../extern/lua-5.1/src/loadlib.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88CC137201F700E6FD3A /* lobject.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lobject.c; path = "../extern/lua-5.1/src/lobject.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88CD137201F700E6FD3A /* lobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lobject.h; path = "../extern/lua-5.1/src/lobject.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88CE137201F700E6FD3A /* lopcodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lopcodes.c; path = "../extern/lua-5.1/src/lopcodes.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88CF137201F700E6FD3A /* lopcodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lopcodes.h; path = "../extern/lua-5.1/src/lopcodes.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88D0137201F700E6FD3A /* loslib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loslib.c; path = "../extern/lua-5.1/src/loslib.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88D1137201F700E6FD3A /* lparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lparser.c; path = "../extern/lua-5.1/src/lparser.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88D2137201F700E6FD3A /* lparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lparser.h; path = "../extern/lua-5.1/src/lparser.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88D3137201F700E6FD3A /* lstate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstate.c; path = "../extern/lua-5.1/src/lstate.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88D4137201F700E6FD3A /* lstate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lstate.h; path = "../extern/lua-5.1/src/lstate.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88D5137201F700E6FD3A /* lstring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstring.c; path = "../extern/lua-5.1/src/lstring.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88D6137201F700E6FD3A /* lstring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lstring.h; path = "../extern/lua-5.1/src/lstring.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88D7137201F700E6FD3A /* lstrlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstrlib.c; path = "../extern/lua-5.1/src/lstrlib.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88D8137201F700E6FD3A /* ltable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltable.c; path = "../extern/lua-5.1/src/ltable.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88D9137201F700E6FD3A /* ltable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ltable.h; path = "../extern/lua-5.1/src/ltable.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88DA137201F700E6FD3A /* ltablib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltablib.c; path = "../extern/lua-5.1/src/ltablib.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88DB137201F700E6FD3A /* ltm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltm.c; path = "../extern/lua-5.1/src/ltm.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88DC137201F700E6FD3A /* ltm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ltm.h; path = "../extern/lua-5.1/src/ltm.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88DD137201F700E6FD3A /* lua.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lua.c; path = "../extern/lua-5.1/src/lua.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88DE137201F700E6FD3A /* lua.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua.h; path = "../extern/lua-5.1/src/lua.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88DF137201F700E6FD3A /* luac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = luac.c; path = "../extern/lua-5.1/src/luac.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88E0137201F700E6FD3A /* luaconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = luaconf.h; path = "../extern/lua-5.1/src/luaconf.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88E1137201F700E6FD3A /* lualib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lualib.h; path = "../extern/lua-5.1/src/lualib.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88E2137201F700E6FD3A /* lundump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lundump.c; path = "../extern/lua-5.1/src/lundump.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88E3137201F700E6FD3A /* lundump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lundump.h; path = "../extern/lua-5.1/src/lundump.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88E4137201F700E6FD3A /* lvm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lvm.c; path = "../extern/lua-5.1/src/lvm.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88E5137201F700E6FD3A /* lvm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lvm.h; path = "../extern/lua-5.1/src/lvm.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88E6137201F700E6FD3A /* lzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lzio.c; path = "../extern/lua-5.1/src/lzio.c"; sourceTree = SOURCE_ROOT; };
+ 2BDB88E7137201F700E6FD3A /* lzio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lzio.h; path = "../extern/lua-5.1/src/lzio.h"; sourceTree = SOURCE_ROOT; };
+ 2BDB88E8137201F700E6FD3A /* print.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = print.c; path = "../extern/lua-5.1/src/print.c"; sourceTree = SOURCE_ROOT; };
3659B56D0F902143002B6B68 /* CommandLineActions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLineActions.cpp; sourceTree = ""; };
3659B56E0F902143002B6B68 /* CommandLineActions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLineActions.h; sourceTree = ""; };
367D57590EDE56F200B46814 /* ScreenHighScores.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScreenHighScores.cpp; path = ../src/ScreenHighScores.cpp; sourceTree = SOURCE_ROOT; };
@@ -2274,9 +2336,6 @@
AA77E75E08B64B9A00FA24CA /* ScreenOptionsManageProfiles.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = ScreenOptionsManageProfiles.h; path = ../src/ScreenOptionsManageProfiles.h; sourceTree = ""; };
AA77E8A108B6ABD500FA24CA /* vecLib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vecLib.framework; path = /System/Library/Frameworks/vecLib.framework; sourceTree = ""; };
AA7A2B940AE09B520054C5BA /* lua */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = lua; sourceTree = BUILT_PRODUCTS_DIR; };
- AA7A2B9D0AE09BC80054C5BA /* lua.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = lua.c; path = src/lua.c; sourceTree = ""; };
- AA7A2B9E0AE09BC90054C5BA /* luac.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = luac.c; path = src/luac.c; sourceTree = ""; };
- AA7A2B9F0AE09BC90054C5BA /* print.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = print.c; path = src/print.c; sourceTree = ""; };
AA7A2BAB0AE09CD50054C5BA /* luac */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = luac; sourceTree = BUILT_PRODUCTS_DIR; };
AA7ADC23072CAB7F00C50A7F /* RageSoundReader_Chain.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = RageSoundReader_Chain.cpp; path = ../src/RageSoundReader_Chain.cpp; sourceTree = ""; };
AA7ADC24072CAB7F00C50A7F /* RageSoundReader_Chain.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = RageSoundReader_Chain.h; path = ../src/RageSoundReader_Chain.h; sourceTree = ""; };
@@ -2833,58 +2892,6 @@
AAE7812B0608249E0034E65F /* ActiveAttackList.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = ActiveAttackList.cpp; path = ../src/ActiveAttackList.cpp; sourceTree = ""; };
AAE7812C0608249E0034E65F /* ActiveAttackList.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = ActiveAttackList.h; path = ../src/ActiveAttackList.h; sourceTree = ""; };
AAE7817E0AC7E37B00AEFC64 /* liblua-5.1.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "liblua-5.1.a"; sourceTree = BUILT_PRODUCTS_DIR; };
- AAE7818B0AC7E53400AEFC64 /* lapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lapi.c; path = src/lapi.c; sourceTree = ""; };
- AAE7818C0AC7E53400AEFC64 /* lapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lapi.h; path = src/lapi.h; sourceTree = ""; };
- AAE7818D0AC7E53400AEFC64 /* lauxlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lauxlib.c; path = src/lauxlib.c; sourceTree = ""; };
- AAE7818E0AC7E53400AEFC64 /* lauxlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lauxlib.h; path = src/lauxlib.h; sourceTree = ""; };
- AAE7818F0AC7E53400AEFC64 /* lbaselib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lbaselib.c; path = src/lbaselib.c; sourceTree = ""; };
- AAE781900AC7E53400AEFC64 /* lcode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcode.c; path = src/lcode.c; sourceTree = ""; };
- AAE781910AC7E53400AEFC64 /* lcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lcode.h; path = src/lcode.h; sourceTree = ""; };
- AAE781920AC7E53400AEFC64 /* ldblib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldblib.c; path = src/ldblib.c; sourceTree = ""; };
- AAE781930AC7E53400AEFC64 /* ldebug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldebug.c; path = src/ldebug.c; sourceTree = ""; };
- AAE781940AC7E53400AEFC64 /* ldebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ldebug.h; path = src/ldebug.h; sourceTree = ""; };
- AAE781950AC7E53400AEFC64 /* ldo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldo.c; path = src/ldo.c; sourceTree = ""; };
- AAE781960AC7E53400AEFC64 /* ldo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ldo.h; path = src/ldo.h; sourceTree = ""; };
- AAE781970AC7E53400AEFC64 /* ldump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldump.c; path = src/ldump.c; sourceTree = ""; };
- AAE781980AC7E53400AEFC64 /* lfunc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lfunc.c; path = src/lfunc.c; sourceTree = ""; };
- AAE781990AC7E53400AEFC64 /* lfunc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lfunc.h; path = src/lfunc.h; sourceTree = ""; };
- AAE7819A0AC7E53400AEFC64 /* lgc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lgc.c; path = src/lgc.c; sourceTree = ""; };
- AAE7819B0AC7E53400AEFC64 /* lgc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lgc.h; path = src/lgc.h; sourceTree = ""; };
- AAE7819C0AC7E53400AEFC64 /* linit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = linit.c; path = src/linit.c; sourceTree = ""; };
- AAE7819D0AC7E53400AEFC64 /* liolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = liolib.c; path = src/liolib.c; sourceTree = ""; };
- AAE7819E0AC7E53400AEFC64 /* llex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = llex.c; path = src/llex.c; sourceTree = ""; };
- AAE7819F0AC7E53400AEFC64 /* llex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = llex.h; path = src/llex.h; sourceTree = ""; };
- AAE781A00AC7E53400AEFC64 /* llimits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = llimits.h; path = src/llimits.h; sourceTree = ""; };
- AAE781A10AC7E53400AEFC64 /* lmathlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmathlib.c; path = src/lmathlib.c; sourceTree = ""; };
- AAE781A20AC7E53400AEFC64 /* lmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmem.c; path = src/lmem.c; sourceTree = ""; };
- AAE781A30AC7E53400AEFC64 /* lmem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lmem.h; path = src/lmem.h; sourceTree = ""; };
- AAE781A40AC7E53400AEFC64 /* loadlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loadlib.c; path = src/loadlib.c; sourceTree = ""; };
- AAE781A50AC7E53400AEFC64 /* lobject.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lobject.c; path = src/lobject.c; sourceTree = ""; };
- AAE781A60AC7E53400AEFC64 /* lobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lobject.h; path = src/lobject.h; sourceTree = ""; };
- AAE781A70AC7E53400AEFC64 /* lopcodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lopcodes.c; path = src/lopcodes.c; sourceTree = ""; };
- AAE781A80AC7E53400AEFC64 /* lopcodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lopcodes.h; path = src/lopcodes.h; sourceTree = ""; };
- AAE781A90AC7E53400AEFC64 /* loslib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loslib.c; path = src/loslib.c; sourceTree = ""; };
- AAE781AA0AC7E53400AEFC64 /* lparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lparser.c; path = src/lparser.c; sourceTree = ""; };
- AAE781AB0AC7E53400AEFC64 /* lparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lparser.h; path = src/lparser.h; sourceTree = ""; };
- AAE781AC0AC7E53400AEFC64 /* lstate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstate.c; path = src/lstate.c; sourceTree = ""; };
- AAE781AD0AC7E53400AEFC64 /* lstate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lstate.h; path = src/lstate.h; sourceTree = ""; };
- AAE781AE0AC7E53400AEFC64 /* lstring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstring.c; path = src/lstring.c; sourceTree = ""; };
- AAE781AF0AC7E53400AEFC64 /* lstring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lstring.h; path = src/lstring.h; sourceTree = ""; };
- AAE781B00AC7E53400AEFC64 /* lstrlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstrlib.c; path = src/lstrlib.c; sourceTree = ""; };
- AAE781B10AC7E53400AEFC64 /* ltable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltable.c; path = src/ltable.c; sourceTree = ""; };
- AAE781B20AC7E53400AEFC64 /* ltable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ltable.h; path = src/ltable.h; sourceTree = ""; };
- AAE781B30AC7E53400AEFC64 /* ltablib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltablib.c; path = src/ltablib.c; sourceTree = ""; };
- AAE781B40AC7E53400AEFC64 /* ltm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltm.c; path = src/ltm.c; sourceTree = ""; };
- AAE781B50AC7E53400AEFC64 /* ltm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ltm.h; path = src/ltm.h; sourceTree = ""; };
- AAE781B60AC7E53400AEFC64 /* lua.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua.h; path = src/lua.h; sourceTree = ""; };
- AAE781B70AC7E53400AEFC64 /* luaconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = luaconf.h; path = src/luaconf.h; sourceTree = ""; };
- AAE781B80AC7E53400AEFC64 /* lualib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lualib.h; path = src/lualib.h; sourceTree = ""; };
- AAE781B90AC7E53400AEFC64 /* lundump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lundump.c; path = src/lundump.c; sourceTree = ""; };
- AAE781BA0AC7E53400AEFC64 /* lundump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lundump.h; path = src/lundump.h; sourceTree = ""; };
- AAE781BB0AC7E53400AEFC64 /* lvm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lvm.c; path = src/lvm.c; sourceTree = ""; };
- AAE781BC0AC7E53400AEFC64 /* lvm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lvm.h; path = src/lvm.h; sourceTree = ""; };
- AAE781BD0AC7E53400AEFC64 /* lzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lzio.c; path = src/lzio.c; sourceTree = ""; };
- AAE781BE0AC7E53400AEFC64 /* lzio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lzio.h; path = src/lzio.h; sourceTree = ""; };
AAEBC6C607A20AFE00793F0E /* RageSurface_Save_JPEG.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = RageSurface_Save_JPEG.cpp; path = ../src/RageSurface_Save_JPEG.cpp; sourceTree = ""; };
AAEBC6C707A20AFE00793F0E /* RageSurface_Save_JPEG.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = RageSurface_Save_JPEG.h; path = ../src/RageSurface_Save_JPEG.h; sourceTree = ""; };
AAEBC6C807A20AFE00793F0E /* RageSurfaceUtils_Dither.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = RageSurfaceUtils_Dither.cpp; path = ../src/RageSurfaceUtils_Dither.cpp; sourceTree = ""; };
@@ -2978,13 +2985,6 @@
EE879BAA132E06C50078FDDC /* glew.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = glew.c; path = src/glew.c; sourceTree = ""; };
EE906F6412BF3A1B00146C96 /* ScreenInstallOverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScreenInstallOverlay.cpp; path = ../src/ScreenInstallOverlay.cpp; sourceTree = SOURCE_ROOT; };
EE906F6512BF3A1B00146C96 /* ScreenInstallOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScreenInstallOverlay.h; path = ../src/ScreenInstallOverlay.h; sourceTree = SOURCE_ROOT; };
- EE906F7012BF3A6900146C96 /* json_batchallocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json_batchallocator.h; path = ../src/jsoncpp/src/lib_json/json_batchallocator.h; sourceTree = SOURCE_ROOT; };
- EE906F7112BF3A6900146C96 /* json_internalarray.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json_internalarray.inl; path = ../src/jsoncpp/src/lib_json/json_internalarray.inl; sourceTree = SOURCE_ROOT; };
- EE906F7212BF3A6900146C96 /* json_internalmap.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json_internalmap.inl; path = ../src/jsoncpp/src/lib_json/json_internalmap.inl; sourceTree = SOURCE_ROOT; };
- EE906F7312BF3A6900146C96 /* json_reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_reader.cpp; path = ../src/jsoncpp/src/lib_json/json_reader.cpp; sourceTree = SOURCE_ROOT; };
- EE906F7412BF3A6900146C96 /* json_value.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_value.cpp; path = ../src/jsoncpp/src/lib_json/json_value.cpp; sourceTree = SOURCE_ROOT; };
- EE906F7512BF3A6900146C96 /* json_valueiterator.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json_valueiterator.inl; path = ../src/jsoncpp/src/lib_json/json_valueiterator.inl; sourceTree = SOURCE_ROOT; };
- EE906F7612BF3A6900146C96 /* json_writer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_writer.cpp; path = ../src/jsoncpp/src/lib_json/json_writer.cpp; sourceTree = SOURCE_ROOT; };
EE906F8012BF3AF800146C96 /* JsonUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JsonUtil.cpp; path = ../src/JsonUtil.cpp; sourceTree = SOURCE_ROOT; };
EE906F8112BF3AF800146C96 /* JsonUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JsonUtil.h; path = ../src/JsonUtil.h; sourceTree = SOURCE_ROOT; };
EE906F8812BF3C7C00146C96 /* FileDownload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileDownload.cpp; path = ../src/FileDownload.cpp; sourceTree = SOURCE_ROOT; };
@@ -3143,12 +3143,7 @@
29B97314FDCFA39411CA2CEA /* SDL App */ = {
isa = PBXGroup;
children = (
- EE879B8E132E06C50078FDDC /* glew-1.5.8 */,
- EE906F6F12BF3A5B00146C96 /* json */,
- AAA070B20CE7B3AD005A3060 /* mad-0.15.1b */,
- AA7C8B920B67467C00FD9940 /* libtomcrypt */,
- AA7C8A7F0B6744F600FD9940 /* libtommath */,
- AAE781870AC7E46E00AEFC64 /* lua-5.1 */,
+ 2BDB87261371F7FF00E6FD3A /* extern */,
AA6EFF7404770F8B005F316C /* Actors */,
AA6EFEFA04770E84005F316C /* ActorsInGameplay */,
AA6EFE6D04770D3E005F316C /* ActorsInMenus */,
@@ -3159,7 +3154,6 @@
AA6E00FE047711FF005F316C /* GlobalSingletons */,
2B766980132FF62B00586512 /* NoteParsing */,
29B97315FDCFA39411CA2CEA /* Other Source */,
- AA8B6C7804AFD82B00D02EE9 /* pcre */,
AA6EFDBB04770A83005F316C /* Rage */,
AA6EFE6A04770D01005F316C /* StepMania */,
AA6E00090477103E005F316C /* Screens */,
@@ -3236,6 +3230,20 @@
name = NoteParsing;
sourceTree = "";
};
+ 2BDB87261371F7FF00E6FD3A /* extern */ = {
+ isa = PBXGroup;
+ children = (
+ EE879B8E132E06C50078FDDC /* glew-1.5.8 */,
+ EE906F6F12BF3A5B00146C96 /* json */,
+ AA7C8A7F0B6744F600FD9940 /* libtommath */,
+ AA7C8B920B67467C00FD9940 /* libtomcrypt */,
+ AAE781870AC7E46E00AEFC64 /* lua-5.1 */,
+ AAA070B20CE7B3AD005A3060 /* mad-0.15.1b */,
+ AA8B6C7804AFD82B00D02EE9 /* pcre */,
+ );
+ name = extern;
+ sourceTree = "";
+ };
AA60E0BB067992D7008ADC41 /* Threads */ = {
isa = PBXGroup;
children = (
@@ -4708,7 +4716,7 @@
AA8B6C7F04AFD87300D02EE9 /* study.c */,
);
name = pcre;
- path = ../src/pcre;
+ path = ../extern/pcre;
sourceTree = "";
};
AAA070B20CE7B3AD005A3060 /* mad-0.15.1b */ = {
@@ -4740,7 +4748,7 @@
AAA070F10CE7B3AE005A3060 /* version.h */,
);
name = "mad-0.15.1b";
- path = "../src/mad-0.15.1b";
+ path = "../extern/mad-0.15.1b";
sourceTree = "";
};
AAA3741C09099ADA00141131 /* Libraries */ = {
@@ -4851,64 +4859,64 @@
AAE781870AC7E46E00AEFC64 /* lua-5.1 */ = {
isa = PBXGroup;
children = (
- AAE7818B0AC7E53400AEFC64 /* lapi.c */,
- AAE7818C0AC7E53400AEFC64 /* lapi.h */,
- AAE7818D0AC7E53400AEFC64 /* lauxlib.c */,
- AAE7818E0AC7E53400AEFC64 /* lauxlib.h */,
- AAE7818F0AC7E53400AEFC64 /* lbaselib.c */,
- AAE781900AC7E53400AEFC64 /* lcode.c */,
- AAE781910AC7E53400AEFC64 /* lcode.h */,
- AAE781920AC7E53400AEFC64 /* ldblib.c */,
- AAE781930AC7E53400AEFC64 /* ldebug.c */,
- AAE781940AC7E53400AEFC64 /* ldebug.h */,
- AAE781950AC7E53400AEFC64 /* ldo.c */,
- AAE781960AC7E53400AEFC64 /* ldo.h */,
- AAE781970AC7E53400AEFC64 /* ldump.c */,
- AAE781980AC7E53400AEFC64 /* lfunc.c */,
- AAE781990AC7E53400AEFC64 /* lfunc.h */,
- AAE7819A0AC7E53400AEFC64 /* lgc.c */,
- AAE7819B0AC7E53400AEFC64 /* lgc.h */,
- AAE7819C0AC7E53400AEFC64 /* linit.c */,
- AAE7819D0AC7E53400AEFC64 /* liolib.c */,
- AAE7819E0AC7E53400AEFC64 /* llex.c */,
- AAE7819F0AC7E53400AEFC64 /* llex.h */,
- AAE781A00AC7E53400AEFC64 /* llimits.h */,
- AAE781A10AC7E53400AEFC64 /* lmathlib.c */,
- AAE781A20AC7E53400AEFC64 /* lmem.c */,
- AAE781A30AC7E53400AEFC64 /* lmem.h */,
- AAE781A40AC7E53400AEFC64 /* loadlib.c */,
- AAE781A50AC7E53400AEFC64 /* lobject.c */,
- AAE781A60AC7E53400AEFC64 /* lobject.h */,
- AAE781A70AC7E53400AEFC64 /* lopcodes.c */,
- AAE781A80AC7E53400AEFC64 /* lopcodes.h */,
- AAE781A90AC7E53400AEFC64 /* loslib.c */,
- AAE781AA0AC7E53400AEFC64 /* lparser.c */,
- AAE781AB0AC7E53400AEFC64 /* lparser.h */,
- AAE781AC0AC7E53400AEFC64 /* lstate.c */,
- AAE781AD0AC7E53400AEFC64 /* lstate.h */,
- AAE781AE0AC7E53400AEFC64 /* lstring.c */,
- AAE781AF0AC7E53400AEFC64 /* lstring.h */,
- AAE781B00AC7E53400AEFC64 /* lstrlib.c */,
- AAE781B10AC7E53400AEFC64 /* ltable.c */,
- AAE781B20AC7E53400AEFC64 /* ltable.h */,
- AAE781B30AC7E53400AEFC64 /* ltablib.c */,
- AAE781B40AC7E53400AEFC64 /* ltm.c */,
- AAE781B50AC7E53400AEFC64 /* ltm.h */,
- AA7A2B9D0AE09BC80054C5BA /* lua.c */,
- AAE781B60AC7E53400AEFC64 /* lua.h */,
- AA7A2B9E0AE09BC90054C5BA /* luac.c */,
- AAE781B70AC7E53400AEFC64 /* luaconf.h */,
- AAE781B80AC7E53400AEFC64 /* lualib.h */,
- AAE781B90AC7E53400AEFC64 /* lundump.c */,
- AAE781BA0AC7E53400AEFC64 /* lundump.h */,
- AAE781BB0AC7E53400AEFC64 /* lvm.c */,
- AAE781BC0AC7E53400AEFC64 /* lvm.h */,
- AAE781BD0AC7E53400AEFC64 /* lzio.c */,
- AAE781BE0AC7E53400AEFC64 /* lzio.h */,
- AA7A2B9F0AE09BC90054C5BA /* print.c */,
+ 2BDB88B2137201F700E6FD3A /* lapi.c */,
+ 2BDB88B3137201F700E6FD3A /* lapi.h */,
+ 2BDB88B4137201F700E6FD3A /* lauxlib.c */,
+ 2BDB88B5137201F700E6FD3A /* lauxlib.h */,
+ 2BDB88B6137201F700E6FD3A /* lbaselib.c */,
+ 2BDB88B7137201F700E6FD3A /* lcode.c */,
+ 2BDB88B8137201F700E6FD3A /* lcode.h */,
+ 2BDB88B9137201F700E6FD3A /* ldblib.c */,
+ 2BDB88BA137201F700E6FD3A /* ldebug.c */,
+ 2BDB88BB137201F700E6FD3A /* ldebug.h */,
+ 2BDB88BC137201F700E6FD3A /* ldo.c */,
+ 2BDB88BD137201F700E6FD3A /* ldo.h */,
+ 2BDB88BE137201F700E6FD3A /* ldump.c */,
+ 2BDB88BF137201F700E6FD3A /* lfunc.c */,
+ 2BDB88C0137201F700E6FD3A /* lfunc.h */,
+ 2BDB88C1137201F700E6FD3A /* lgc.c */,
+ 2BDB88C2137201F700E6FD3A /* lgc.h */,
+ 2BDB88C3137201F700E6FD3A /* linit.c */,
+ 2BDB88C4137201F700E6FD3A /* liolib.c */,
+ 2BDB88C5137201F700E6FD3A /* llex.c */,
+ 2BDB88C6137201F700E6FD3A /* llex.h */,
+ 2BDB88C7137201F700E6FD3A /* llimits.h */,
+ 2BDB88C8137201F700E6FD3A /* lmathlib.c */,
+ 2BDB88C9137201F700E6FD3A /* lmem.c */,
+ 2BDB88CA137201F700E6FD3A /* lmem.h */,
+ 2BDB88CB137201F700E6FD3A /* loadlib.c */,
+ 2BDB88CC137201F700E6FD3A /* lobject.c */,
+ 2BDB88CD137201F700E6FD3A /* lobject.h */,
+ 2BDB88CE137201F700E6FD3A /* lopcodes.c */,
+ 2BDB88CF137201F700E6FD3A /* lopcodes.h */,
+ 2BDB88D0137201F700E6FD3A /* loslib.c */,
+ 2BDB88D1137201F700E6FD3A /* lparser.c */,
+ 2BDB88D2137201F700E6FD3A /* lparser.h */,
+ 2BDB88D3137201F700E6FD3A /* lstate.c */,
+ 2BDB88D4137201F700E6FD3A /* lstate.h */,
+ 2BDB88D5137201F700E6FD3A /* lstring.c */,
+ 2BDB88D6137201F700E6FD3A /* lstring.h */,
+ 2BDB88D7137201F700E6FD3A /* lstrlib.c */,
+ 2BDB88D8137201F700E6FD3A /* ltable.c */,
+ 2BDB88D9137201F700E6FD3A /* ltable.h */,
+ 2BDB88DA137201F700E6FD3A /* ltablib.c */,
+ 2BDB88DB137201F700E6FD3A /* ltm.c */,
+ 2BDB88DC137201F700E6FD3A /* ltm.h */,
+ 2BDB88DD137201F700E6FD3A /* lua.c */,
+ 2BDB88DE137201F700E6FD3A /* lua.h */,
+ 2BDB88DF137201F700E6FD3A /* luac.c */,
+ 2BDB88E0137201F700E6FD3A /* luaconf.h */,
+ 2BDB88E1137201F700E6FD3A /* lualib.h */,
+ 2BDB88E2137201F700E6FD3A /* lundump.c */,
+ 2BDB88E3137201F700E6FD3A /* lundump.h */,
+ 2BDB88E4137201F700E6FD3A /* lvm.c */,
+ 2BDB88E5137201F700E6FD3A /* lvm.h */,
+ 2BDB88E6137201F700E6FD3A /* lzio.c */,
+ 2BDB88E7137201F700E6FD3A /* lzio.h */,
+ 2BDB88E8137201F700E6FD3A /* print.c */,
);
name = "lua-5.1";
- path = "../src/lua-5.1";
+ path = "../extern/lua-5.1";
sourceTree = "";
};
EE879B8E132E06C50078FDDC /* glew-1.5.8 */ = {
@@ -4923,13 +4931,13 @@
EE906F6F12BF3A5B00146C96 /* json */ = {
isa = PBXGroup;
children = (
- EE906F7012BF3A6900146C96 /* json_batchallocator.h */,
- EE906F7112BF3A6900146C96 /* json_internalarray.inl */,
- EE906F7212BF3A6900146C96 /* json_internalmap.inl */,
- EE906F7312BF3A6900146C96 /* json_reader.cpp */,
- EE906F7412BF3A6900146C96 /* json_value.cpp */,
- EE906F7512BF3A6900146C96 /* json_valueiterator.inl */,
- EE906F7612BF3A6900146C96 /* json_writer.cpp */,
+ 2BD06FDD137240CF0018CB9F /* json_batchallocator.h */,
+ 2BD06FDE137240CF0018CB9F /* json_internalarray.inl */,
+ 2BD06FDF137240CF0018CB9F /* json_internalmap.inl */,
+ 2BD06FE0137240CF0018CB9F /* json_reader.cpp */,
+ 2BD06FE1137240CF0018CB9F /* json_value.cpp */,
+ 2BD06FE2137240CF0018CB9F /* json_valueiterator.inl */,
+ 2BD06FE3137240CF0018CB9F /* json_writer.cpp */,
);
name = json;
sourceTree = "";
@@ -4950,7 +4958,6 @@
36C6888411297FFE00453295 /* RageFileDriverReadAhead.h in Headers */,
36C6888611297FFE00453295 /* RageFileManager_ReadAhead.h in Headers */,
EE906F6712BF3A1B00146C96 /* ScreenInstallOverlay.h in Headers */,
- EE906F7712BF3A6900146C96 /* json_batchallocator.h in Headers */,
EE906F8312BF3AF800146C96 /* JsonUtil.h in Headers */,
EE906F8B12BF3C7C00146C96 /* FileDownload.h in Headers */,
2BA7925F1304F20D002BD8E1 /* NotesLoaderSSC.h in Headers */,
@@ -4959,6 +4966,7 @@
EE879B61132DEE720078FDDC /* RageDisplay_Legacy_Helpers.h in Headers */,
EE879B63132DEE720078FDDC /* RageDisplay_Legacy.h in Headers */,
2B76698B132FF71500586512 /* NotesLoaderSMA.h in Headers */,
+ 2BD06FEE137242680018CB9F /* json_batchallocator.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -5427,29 +5435,29 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
- AAE781C00AC7E53500AEFC64 /* lapi.h in Headers */,
- AAE781C20AC7E53500AEFC64 /* lauxlib.h in Headers */,
- AAE781C50AC7E53500AEFC64 /* lcode.h in Headers */,
- AAE781C80AC7E53500AEFC64 /* ldebug.h in Headers */,
- AAE781CA0AC7E53500AEFC64 /* ldo.h in Headers */,
- AAE781CD0AC7E53500AEFC64 /* lfunc.h in Headers */,
- AAE781CF0AC7E53500AEFC64 /* lgc.h in Headers */,
- AAE781D30AC7E53500AEFC64 /* llex.h in Headers */,
- AAE781D40AC7E53500AEFC64 /* llimits.h in Headers */,
- AAE781D70AC7E53500AEFC64 /* lmem.h in Headers */,
- AAE781DA0AC7E53500AEFC64 /* lobject.h in Headers */,
- AAE781DC0AC7E53500AEFC64 /* lopcodes.h in Headers */,
- AAE781DF0AC7E53500AEFC64 /* lparser.h in Headers */,
- AAE781E10AC7E53500AEFC64 /* lstate.h in Headers */,
- AAE781E30AC7E53500AEFC64 /* lstring.h in Headers */,
- AAE781E60AC7E53500AEFC64 /* ltable.h in Headers */,
- AAE781E90AC7E53500AEFC64 /* ltm.h in Headers */,
- AAE781EA0AC7E53500AEFC64 /* lua.h in Headers */,
- AAE781EB0AC7E53500AEFC64 /* luaconf.h in Headers */,
- AAE781EC0AC7E53500AEFC64 /* lualib.h in Headers */,
- AAE781EE0AC7E53500AEFC64 /* lundump.h in Headers */,
- AAE781F00AC7E53500AEFC64 /* lvm.h in Headers */,
- AAE781F20AC7E53500AEFC64 /* lzio.h in Headers */,
+ 2BDB88EA137201F700E6FD3A /* lapi.h in Headers */,
+ 2BDB88EC137201F700E6FD3A /* lauxlib.h in Headers */,
+ 2BDB88EF137201F700E6FD3A /* lcode.h in Headers */,
+ 2BDB88F2137201F700E6FD3A /* ldebug.h in Headers */,
+ 2BDB88F4137201F700E6FD3A /* ldo.h in Headers */,
+ 2BDB88F7137201F700E6FD3A /* lfunc.h in Headers */,
+ 2BDB88F9137201F700E6FD3A /* lgc.h in Headers */,
+ 2BDB88FD137201F700E6FD3A /* llex.h in Headers */,
+ 2BDB88FE137201F700E6FD3A /* llimits.h in Headers */,
+ 2BDB8901137201F700E6FD3A /* lmem.h in Headers */,
+ 2BDB8904137201F700E6FD3A /* lobject.h in Headers */,
+ 2BDB8906137201F700E6FD3A /* lopcodes.h in Headers */,
+ 2BDB8909137201F700E6FD3A /* lparser.h in Headers */,
+ 2BDB890B137201F700E6FD3A /* lstate.h in Headers */,
+ 2BDB890D137201F700E6FD3A /* lstring.h in Headers */,
+ 2BDB8910137201F700E6FD3A /* ltable.h in Headers */,
+ 2BDB8913137201F700E6FD3A /* ltm.h in Headers */,
+ 2BDB8915137201F700E6FD3A /* lua.h in Headers */,
+ 2BDB8917137201F700E6FD3A /* luaconf.h in Headers */,
+ 2BDB8918137201F700E6FD3A /* lualib.h in Headers */,
+ 2BDB891A137201F700E6FD3A /* lundump.h in Headers */,
+ 2BDB891C137201F700E6FD3A /* lvm.h in Headers */,
+ 2BDB891E137201F700E6FD3A /* lzio.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -5675,9 +5683,9 @@
AA29CD3E0558741A00961A51 /* smicon.icns in Resources */,
AAF6A2F909B695BA00D5C614 /* Localizable.strings in Resources */,
AA1DE9580C5468CE00D59F20 /* Hardware.plist in Resources */,
- EE906F7812BF3A6900146C96 /* json_internalarray.inl in Resources */,
- EE906F7912BF3A6900146C96 /* json_internalmap.inl in Resources */,
- EE906F7C12BF3A6900146C96 /* json_valueiterator.inl in Resources */,
+ 2BD06FEF137242680018CB9F /* json_internalarray.inl in Resources */,
+ 2BD06FF0137242680018CB9F /* json_internalmap.inl in Resources */,
+ 2BD06FF3137242680018CB9F /* json_valueiterator.inl in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6191,9 +6199,6 @@
36C6888311297FFE00453295 /* RageFileDriverReadAhead.cpp in Sources */,
36C6888511297FFE00453295 /* RageFileManager_ReadAhead.cpp in Sources */,
EE906F6612BF3A1B00146C96 /* ScreenInstallOverlay.cpp in Sources */,
- EE906F7A12BF3A6900146C96 /* json_reader.cpp in Sources */,
- EE906F7B12BF3A6900146C96 /* json_value.cpp in Sources */,
- EE906F7D12BF3A6900146C96 /* json_writer.cpp in Sources */,
EE906F8212BF3AF800146C96 /* JsonUtil.cpp in Sources */,
EE906F8A12BF3C7C00146C96 /* FileDownload.cpp in Sources */,
2BA7925E1304F20D002BD8E1 /* NotesLoaderSSC.cpp in Sources */,
@@ -6203,6 +6208,9 @@
EE879B62132DEE720078FDDC /* RageDisplay_Legacy.cpp in Sources */,
EE879BC3132E06C50078FDDC /* glew.c in Sources */,
2B76698C132FF71500586512 /* NotesLoaderSMA.cpp in Sources */,
+ 2BD06FF1137242680018CB9F /* json_reader.cpp in Sources */,
+ 2BD06FF2137242680018CB9F /* json_value.cpp in Sources */,
+ 2BD06FF4137242680018CB9F /* json_writer.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6608,7 +6616,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- AA7A2BA00AE09BC90054C5BA /* lua.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6616,8 +6623,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- AA7A2BB10AE09CF80054C5BA /* print.c in Sources */,
- AA7A2BB20AE09CF90054C5BA /* luac.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6919,35 +6924,38 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- AAE781BF0AC7E53500AEFC64 /* lapi.c in Sources */,
- AAE781C10AC7E53500AEFC64 /* lauxlib.c in Sources */,
- AAE781C30AC7E53500AEFC64 /* lbaselib.c in Sources */,
- AAE781C40AC7E53500AEFC64 /* lcode.c in Sources */,
- AAE781C60AC7E53500AEFC64 /* ldblib.c in Sources */,
- AAE781C70AC7E53500AEFC64 /* ldebug.c in Sources */,
- AAE781C90AC7E53500AEFC64 /* ldo.c in Sources */,
- AAE781CB0AC7E53500AEFC64 /* ldump.c in Sources */,
- AAE781CC0AC7E53500AEFC64 /* lfunc.c in Sources */,
- AAE781CE0AC7E53500AEFC64 /* lgc.c in Sources */,
- AAE781D00AC7E53500AEFC64 /* linit.c in Sources */,
- AAE781D10AC7E53500AEFC64 /* liolib.c in Sources */,
- AAE781D20AC7E53500AEFC64 /* llex.c in Sources */,
- AAE781D50AC7E53500AEFC64 /* lmathlib.c in Sources */,
- AAE781D60AC7E53500AEFC64 /* lmem.c in Sources */,
- AAE781D80AC7E53500AEFC64 /* loadlib.c in Sources */,
- AAE781D90AC7E53500AEFC64 /* lobject.c in Sources */,
- AAE781DB0AC7E53500AEFC64 /* lopcodes.c in Sources */,
- AAE781DD0AC7E53500AEFC64 /* loslib.c in Sources */,
- AAE781DE0AC7E53500AEFC64 /* lparser.c in Sources */,
- AAE781E00AC7E53500AEFC64 /* lstate.c in Sources */,
- AAE781E20AC7E53500AEFC64 /* lstring.c in Sources */,
- AAE781E40AC7E53500AEFC64 /* lstrlib.c in Sources */,
- AAE781E50AC7E53500AEFC64 /* ltable.c in Sources */,
- AAE781E70AC7E53500AEFC64 /* ltablib.c in Sources */,
- AAE781E80AC7E53500AEFC64 /* ltm.c in Sources */,
- AAE781ED0AC7E53500AEFC64 /* lundump.c in Sources */,
- AAE781EF0AC7E53500AEFC64 /* lvm.c in Sources */,
- AAE781F10AC7E53500AEFC64 /* lzio.c in Sources */,
+ 2BDB88E9137201F700E6FD3A /* lapi.c in Sources */,
+ 2BDB88EB137201F700E6FD3A /* lauxlib.c in Sources */,
+ 2BDB88ED137201F700E6FD3A /* lbaselib.c in Sources */,
+ 2BDB88EE137201F700E6FD3A /* lcode.c in Sources */,
+ 2BDB88F0137201F700E6FD3A /* ldblib.c in Sources */,
+ 2BDB88F1137201F700E6FD3A /* ldebug.c in Sources */,
+ 2BDB88F3137201F700E6FD3A /* ldo.c in Sources */,
+ 2BDB88F5137201F700E6FD3A /* ldump.c in Sources */,
+ 2BDB88F6137201F700E6FD3A /* lfunc.c in Sources */,
+ 2BDB88F8137201F700E6FD3A /* lgc.c in Sources */,
+ 2BDB88FA137201F700E6FD3A /* linit.c in Sources */,
+ 2BDB88FB137201F700E6FD3A /* liolib.c in Sources */,
+ 2BDB88FC137201F700E6FD3A /* llex.c in Sources */,
+ 2BDB88FF137201F700E6FD3A /* lmathlib.c in Sources */,
+ 2BDB8900137201F700E6FD3A /* lmem.c in Sources */,
+ 2BDB8902137201F700E6FD3A /* loadlib.c in Sources */,
+ 2BDB8903137201F700E6FD3A /* lobject.c in Sources */,
+ 2BDB8905137201F700E6FD3A /* lopcodes.c in Sources */,
+ 2BDB8907137201F700E6FD3A /* loslib.c in Sources */,
+ 2BDB8908137201F700E6FD3A /* lparser.c in Sources */,
+ 2BDB890A137201F700E6FD3A /* lstate.c in Sources */,
+ 2BDB890C137201F700E6FD3A /* lstring.c in Sources */,
+ 2BDB890E137201F700E6FD3A /* lstrlib.c in Sources */,
+ 2BDB890F137201F700E6FD3A /* ltable.c in Sources */,
+ 2BDB8911137201F700E6FD3A /* ltablib.c in Sources */,
+ 2BDB8912137201F700E6FD3A /* ltm.c in Sources */,
+ 2BDB8914137201F700E6FD3A /* lua.c in Sources */,
+ 2BDB8916137201F700E6FD3A /* luac.c in Sources */,
+ 2BDB8919137201F700E6FD3A /* lundump.c in Sources */,
+ 2BDB891B137201F700E6FD3A /* lvm.c in Sources */,
+ 2BDB891D137201F700E6FD3A /* lzio.c in Sources */,
+ 2BDB891F137201F700E6FD3A /* print.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/src/crypto/CryptBn.cpp b/extern/crypto/CryptBn.cpp
similarity index 100%
rename from src/crypto/CryptBn.cpp
rename to extern/crypto/CryptBn.cpp
diff --git a/src/crypto/CryptBn.h b/extern/crypto/CryptBn.h
similarity index 100%
rename from src/crypto/CryptBn.h
rename to extern/crypto/CryptBn.h
diff --git a/src/crypto/CryptMD5.cpp b/extern/crypto/CryptMD5.cpp
similarity index 100%
rename from src/crypto/CryptMD5.cpp
rename to extern/crypto/CryptMD5.cpp
diff --git a/src/crypto/CryptMD5.h b/extern/crypto/CryptMD5.h
similarity index 100%
rename from src/crypto/CryptMD5.h
rename to extern/crypto/CryptMD5.h
diff --git a/src/crypto/CryptNoise.cpp b/extern/crypto/CryptNoise.cpp
similarity index 100%
rename from src/crypto/CryptNoise.cpp
rename to extern/crypto/CryptNoise.cpp
diff --git a/src/crypto/CryptPrime.cpp b/extern/crypto/CryptPrime.cpp
similarity index 100%
rename from src/crypto/CryptPrime.cpp
rename to extern/crypto/CryptPrime.cpp
diff --git a/src/crypto/CryptPrime.h b/extern/crypto/CryptPrime.h
similarity index 100%
rename from src/crypto/CryptPrime.h
rename to extern/crypto/CryptPrime.h
diff --git a/src/crypto/CryptRSA.cpp b/extern/crypto/CryptRSA.cpp
similarity index 100%
rename from src/crypto/CryptRSA.cpp
rename to extern/crypto/CryptRSA.cpp
diff --git a/src/crypto/CryptRSA.h b/extern/crypto/CryptRSA.h
similarity index 100%
rename from src/crypto/CryptRSA.h
rename to extern/crypto/CryptRSA.h
diff --git a/src/crypto/CryptRand.cpp b/extern/crypto/CryptRand.cpp
similarity index 100%
rename from src/crypto/CryptRand.cpp
rename to extern/crypto/CryptRand.cpp
diff --git a/src/crypto/CryptRand.h b/extern/crypto/CryptRand.h
similarity index 100%
rename from src/crypto/CryptRand.h
rename to extern/crypto/CryptRand.h
diff --git a/src/crypto/CryptSH512.cpp b/extern/crypto/CryptSH512.cpp
similarity index 100%
rename from src/crypto/CryptSH512.cpp
rename to extern/crypto/CryptSH512.cpp
diff --git a/src/crypto/CryptSH512.h b/extern/crypto/CryptSH512.h
similarity index 100%
rename from src/crypto/CryptSH512.h
rename to extern/crypto/CryptSH512.h
diff --git a/src/crypto/CryptSHA.cpp b/extern/crypto/CryptSHA.cpp
similarity index 100%
rename from src/crypto/CryptSHA.cpp
rename to extern/crypto/CryptSHA.cpp
diff --git a/src/crypto/CryptSHA.h b/extern/crypto/CryptSHA.h
similarity index 100%
rename from src/crypto/CryptSHA.h
rename to extern/crypto/CryptSHA.h
diff --git a/src/jsoncpp/AUTHORS b/extern/jsoncpp/AUTHORS
similarity index 100%
rename from src/jsoncpp/AUTHORS
rename to extern/jsoncpp/AUTHORS
diff --git a/src/jsoncpp/LICENSE b/extern/jsoncpp/LICENSE
similarity index 100%
rename from src/jsoncpp/LICENSE
rename to extern/jsoncpp/LICENSE
diff --git a/src/jsoncpp/README.txt b/extern/jsoncpp/README.txt
similarity index 100%
rename from src/jsoncpp/README.txt
rename to extern/jsoncpp/README.txt
diff --git a/src/jsoncpp/doc/doxyfile.in b/extern/jsoncpp/doc/doxyfile.in
similarity index 100%
rename from src/jsoncpp/doc/doxyfile.in
rename to extern/jsoncpp/doc/doxyfile.in
diff --git a/src/jsoncpp/doc/footer.html b/extern/jsoncpp/doc/footer.html
similarity index 100%
rename from src/jsoncpp/doc/footer.html
rename to extern/jsoncpp/doc/footer.html
diff --git a/src/jsoncpp/doc/header.html b/extern/jsoncpp/doc/header.html
similarity index 100%
rename from src/jsoncpp/doc/header.html
rename to extern/jsoncpp/doc/header.html
diff --git a/src/jsoncpp/doc/jsoncpp.dox b/extern/jsoncpp/doc/jsoncpp.dox
similarity index 100%
rename from src/jsoncpp/doc/jsoncpp.dox
rename to extern/jsoncpp/doc/jsoncpp.dox
diff --git a/src/jsoncpp/doc/readme.txt b/extern/jsoncpp/doc/readme.txt
similarity index 100%
rename from src/jsoncpp/doc/readme.txt
rename to extern/jsoncpp/doc/readme.txt
diff --git a/src/jsoncpp/doc/roadmap.dox b/extern/jsoncpp/doc/roadmap.dox
similarity index 100%
rename from src/jsoncpp/doc/roadmap.dox
rename to extern/jsoncpp/doc/roadmap.dox
diff --git a/src/jsoncpp/include/json/autolink.h b/extern/jsoncpp/include/json/autolink.h
similarity index 100%
rename from src/jsoncpp/include/json/autolink.h
rename to extern/jsoncpp/include/json/autolink.h
diff --git a/src/jsoncpp/include/json/config.h b/extern/jsoncpp/include/json/config.h
similarity index 100%
rename from src/jsoncpp/include/json/config.h
rename to extern/jsoncpp/include/json/config.h
diff --git a/src/jsoncpp/include/json/features.h b/extern/jsoncpp/include/json/features.h
similarity index 100%
rename from src/jsoncpp/include/json/features.h
rename to extern/jsoncpp/include/json/features.h
diff --git a/src/jsoncpp/include/json/forwards.h b/extern/jsoncpp/include/json/forwards.h
similarity index 100%
rename from src/jsoncpp/include/json/forwards.h
rename to extern/jsoncpp/include/json/forwards.h
diff --git a/src/jsoncpp/include/json/json.h b/extern/jsoncpp/include/json/json.h
similarity index 100%
rename from src/jsoncpp/include/json/json.h
rename to extern/jsoncpp/include/json/json.h
diff --git a/src/jsoncpp/include/json/reader.h b/extern/jsoncpp/include/json/reader.h
similarity index 100%
rename from src/jsoncpp/include/json/reader.h
rename to extern/jsoncpp/include/json/reader.h
diff --git a/src/jsoncpp/include/json/value.h b/extern/jsoncpp/include/json/value.h
similarity index 100%
rename from src/jsoncpp/include/json/value.h
rename to extern/jsoncpp/include/json/value.h
diff --git a/src/jsoncpp/include/json/writer.h b/extern/jsoncpp/include/json/writer.h
similarity index 100%
rename from src/jsoncpp/include/json/writer.h
rename to extern/jsoncpp/include/json/writer.h
diff --git a/src/jsoncpp/src/lib_json/json_batchallocator.h b/extern/jsoncpp/src/lib_json/json_batchallocator.h
similarity index 100%
rename from src/jsoncpp/src/lib_json/json_batchallocator.h
rename to extern/jsoncpp/src/lib_json/json_batchallocator.h
diff --git a/src/jsoncpp/src/lib_json/json_internalarray.inl b/extern/jsoncpp/src/lib_json/json_internalarray.inl
similarity index 100%
rename from src/jsoncpp/src/lib_json/json_internalarray.inl
rename to extern/jsoncpp/src/lib_json/json_internalarray.inl
diff --git a/src/jsoncpp/src/lib_json/json_internalmap.inl b/extern/jsoncpp/src/lib_json/json_internalmap.inl
similarity index 100%
rename from src/jsoncpp/src/lib_json/json_internalmap.inl
rename to extern/jsoncpp/src/lib_json/json_internalmap.inl
diff --git a/src/jsoncpp/src/lib_json/json_reader.cpp b/extern/jsoncpp/src/lib_json/json_reader.cpp
similarity index 99%
rename from src/jsoncpp/src/lib_json/json_reader.cpp
rename to extern/jsoncpp/src/lib_json/json_reader.cpp
index cefcc8c198..86cafcafaa 100644
--- a/src/jsoncpp/src/lib_json/json_reader.cpp
+++ b/extern/jsoncpp/src/lib_json/json_reader.cpp
@@ -1,5 +1,5 @@
-#include
-#include
+#include <../extern/jsoncpp/include/json/reader.h>
+#include <../extern/jsoncpp/include/json/value.h>
#include
#include
#include
diff --git a/src/jsoncpp/src/lib_json/json_value.cpp b/extern/jsoncpp/src/lib_json/json_value.cpp
similarity index 99%
rename from src/jsoncpp/src/lib_json/json_value.cpp
rename to extern/jsoncpp/src/lib_json/json_value.cpp
index fd773ec119..fb480daa4a 100644
--- a/src/jsoncpp/src/lib_json/json_value.cpp
+++ b/extern/jsoncpp/src/lib_json/json_value.cpp
@@ -1,6 +1,6 @@
#include
-#include
-#include
+#include <../extern/jsoncpp/include/json/value.h>
+#include <../extern/jsoncpp/include/json/writer.h>
#include
#include
#include
diff --git a/src/jsoncpp/src/lib_json/json_valueiterator.inl b/extern/jsoncpp/src/lib_json/json_valueiterator.inl
similarity index 100%
rename from src/jsoncpp/src/lib_json/json_valueiterator.inl
rename to extern/jsoncpp/src/lib_json/json_valueiterator.inl
diff --git a/src/jsoncpp/src/lib_json/json_writer.cpp b/extern/jsoncpp/src/lib_json/json_writer.cpp
similarity index 99%
rename from src/jsoncpp/src/lib_json/json_writer.cpp
rename to extern/jsoncpp/src/lib_json/json_writer.cpp
index 051d0dcbbb..7868a22cbf 100644
--- a/src/jsoncpp/src/lib_json/json_writer.cpp
+++ b/extern/jsoncpp/src/lib_json/json_writer.cpp
@@ -1,4 +1,4 @@
-#include
+#include <../extern/jsoncpp/include/json/writer.h>
#include
#include
#include
diff --git a/src/jsoncpp/src/lib_json/sconscript b/extern/jsoncpp/src/lib_json/sconscript
similarity index 100%
rename from src/jsoncpp/src/lib_json/sconscript
rename to extern/jsoncpp/src/lib_json/sconscript
diff --git a/src/jsoncpp/version b/extern/jsoncpp/version
similarity index 100%
rename from src/jsoncpp/version
rename to extern/jsoncpp/version
diff --git a/src/libjpeg/jconfig.h b/extern/libjpeg/jconfig.h
similarity index 100%
rename from src/libjpeg/jconfig.h
rename to extern/libjpeg/jconfig.h
diff --git a/src/libjpeg/jerror.h b/extern/libjpeg/jerror.h
similarity index 100%
rename from src/libjpeg/jerror.h
rename to extern/libjpeg/jerror.h
diff --git a/src/libjpeg/jmorecfg.h b/extern/libjpeg/jmorecfg.h
similarity index 100%
rename from src/libjpeg/jmorecfg.h
rename to extern/libjpeg/jmorecfg.h
diff --git a/src/libjpeg/jpeg.lib b/extern/libjpeg/jpeg.lib
similarity index 100%
rename from src/libjpeg/jpeg.lib
rename to extern/libjpeg/jpeg.lib
diff --git a/src/libjpeg/jpeglib.h b/extern/libjpeg/jpeglib.h
similarity index 100%
rename from src/libjpeg/jpeglib.h
rename to extern/libjpeg/jpeglib.h
diff --git a/src/libjpeg/xboxjpeg.lib b/extern/libjpeg/xboxjpeg.lib
similarity index 100%
rename from src/libjpeg/xboxjpeg.lib
rename to extern/libjpeg/xboxjpeg.lib
diff --git a/src/libpng/include/1.2.7/png.h b/extern/libpng/include/1.2.7/png.h
similarity index 100%
rename from src/libpng/include/1.2.7/png.h
rename to extern/libpng/include/1.2.7/png.h
diff --git a/src/libpng/include/1.2.7/pngconf.h b/extern/libpng/include/1.2.7/pngconf.h
similarity index 100%
rename from src/libpng/include/1.2.7/pngconf.h
rename to extern/libpng/include/1.2.7/pngconf.h
diff --git a/src/libpng/include/png.h b/extern/libpng/include/png.h
similarity index 99%
rename from src/libpng/include/png.h
rename to extern/libpng/include/png.h
index 430eb90f4c..70acb20a2e 100644
--- a/src/libpng/include/png.h
+++ b/extern/libpng/include/png.h
@@ -388,7 +388,7 @@
#ifndef PNG_VERSION_INFO_ONLY
/* Include the compression library's header */
-#include "zlib/zlib.h"
+#include "../extern/zlib/zlib.h"
#endif
/* Include all user configurable info, including optional assembler routines */
diff --git a/src/libpng/include/pngconf.h b/extern/libpng/include/pngconf.h
similarity index 100%
rename from src/libpng/include/pngconf.h
rename to extern/libpng/include/pngconf.h
diff --git a/src/libpng/lib/1.2.7/libpng.lib b/extern/libpng/lib/1.2.7/libpng.lib
similarity index 100%
rename from src/libpng/lib/1.2.7/libpng.lib
rename to extern/libpng/lib/1.2.7/libpng.lib
diff --git a/src/libpng/lib/libpng.lib b/extern/libpng/lib/libpng.lib
similarity index 100%
rename from src/libpng/lib/libpng.lib
rename to extern/libpng/lib/libpng.lib
diff --git a/src/libpng/lib/xboxlibpng.lib b/extern/libpng/lib/xboxlibpng.lib
similarity index 100%
rename from src/libpng/lib/xboxlibpng.lib
rename to extern/libpng/lib/xboxlibpng.lib
diff --git a/src/lua-5.1/COPYRIGHT b/extern/lua-5.1/COPYRIGHT
similarity index 100%
rename from src/lua-5.1/COPYRIGHT
rename to extern/lua-5.1/COPYRIGHT
diff --git a/src/lua-5.1/HISTORY b/extern/lua-5.1/HISTORY
similarity index 100%
rename from src/lua-5.1/HISTORY
rename to extern/lua-5.1/HISTORY
diff --git a/src/lua-5.1/INSTALL b/extern/lua-5.1/INSTALL
similarity index 100%
rename from src/lua-5.1/INSTALL
rename to extern/lua-5.1/INSTALL
diff --git a/src/lua-5.1/README b/extern/lua-5.1/README
similarity index 100%
rename from src/lua-5.1/README
rename to extern/lua-5.1/README
diff --git a/src/lua-5.1/doc/contents.html b/extern/lua-5.1/doc/contents.html
similarity index 100%
rename from src/lua-5.1/doc/contents.html
rename to extern/lua-5.1/doc/contents.html
diff --git a/src/lua-5.1/doc/logo.gif b/extern/lua-5.1/doc/logo.gif
similarity index 100%
rename from src/lua-5.1/doc/logo.gif
rename to extern/lua-5.1/doc/logo.gif
diff --git a/src/lua-5.1/doc/lua.1 b/extern/lua-5.1/doc/lua.1
similarity index 100%
rename from src/lua-5.1/doc/lua.1
rename to extern/lua-5.1/doc/lua.1
diff --git a/src/lua-5.1/doc/lua.css b/extern/lua-5.1/doc/lua.css
similarity index 100%
rename from src/lua-5.1/doc/lua.css
rename to extern/lua-5.1/doc/lua.css
diff --git a/src/lua-5.1/doc/lua.html b/extern/lua-5.1/doc/lua.html
similarity index 100%
rename from src/lua-5.1/doc/lua.html
rename to extern/lua-5.1/doc/lua.html
diff --git a/src/lua-5.1/doc/luac.1 b/extern/lua-5.1/doc/luac.1
similarity index 100%
rename from src/lua-5.1/doc/luac.1
rename to extern/lua-5.1/doc/luac.1
diff --git a/src/lua-5.1/doc/luac.html b/extern/lua-5.1/doc/luac.html
similarity index 100%
rename from src/lua-5.1/doc/luac.html
rename to extern/lua-5.1/doc/luac.html
diff --git a/src/lua-5.1/doc/manual.html b/extern/lua-5.1/doc/manual.html
similarity index 100%
rename from src/lua-5.1/doc/manual.html
rename to extern/lua-5.1/doc/manual.html
diff --git a/src/lua-5.1/doc/readme.html b/extern/lua-5.1/doc/readme.html
similarity index 100%
rename from src/lua-5.1/doc/readme.html
rename to extern/lua-5.1/doc/readme.html
diff --git a/src/lua-5.1/etc/README b/extern/lua-5.1/etc/README
similarity index 100%
rename from src/lua-5.1/etc/README
rename to extern/lua-5.1/etc/README
diff --git a/src/lua-5.1/etc/all.c b/extern/lua-5.1/etc/all.c
similarity index 100%
rename from src/lua-5.1/etc/all.c
rename to extern/lua-5.1/etc/all.c
diff --git a/src/lua-5.1/etc/lua.hpp b/extern/lua-5.1/etc/lua.hpp
similarity index 100%
rename from src/lua-5.1/etc/lua.hpp
rename to extern/lua-5.1/etc/lua.hpp
diff --git a/src/lua-5.1/etc/lua.ico b/extern/lua-5.1/etc/lua.ico
similarity index 100%
rename from src/lua-5.1/etc/lua.ico
rename to extern/lua-5.1/etc/lua.ico
diff --git a/src/lua-5.1/etc/lua.pc b/extern/lua-5.1/etc/lua.pc
similarity index 100%
rename from src/lua-5.1/etc/lua.pc
rename to extern/lua-5.1/etc/lua.pc
diff --git a/src/lua-5.1/etc/luavs.bat b/extern/lua-5.1/etc/luavs.bat
similarity index 100%
rename from src/lua-5.1/etc/luavs.bat
rename to extern/lua-5.1/etc/luavs.bat
diff --git a/src/lua-5.1/etc/min.c b/extern/lua-5.1/etc/min.c
similarity index 100%
rename from src/lua-5.1/etc/min.c
rename to extern/lua-5.1/etc/min.c
diff --git a/src/lua-5.1/etc/noparser.c b/extern/lua-5.1/etc/noparser.c
similarity index 100%
rename from src/lua-5.1/etc/noparser.c
rename to extern/lua-5.1/etc/noparser.c
diff --git a/src/lua-5.1/etc/strict.lua b/extern/lua-5.1/etc/strict.lua
similarity index 100%
rename from src/lua-5.1/etc/strict.lua
rename to extern/lua-5.1/etc/strict.lua
diff --git a/src/lua-5.1/src/lapi.c b/extern/lua-5.1/src/lapi.c
similarity index 100%
rename from src/lua-5.1/src/lapi.c
rename to extern/lua-5.1/src/lapi.c
diff --git a/src/lua-5.1/src/lapi.h b/extern/lua-5.1/src/lapi.h
similarity index 100%
rename from src/lua-5.1/src/lapi.h
rename to extern/lua-5.1/src/lapi.h
diff --git a/src/lua-5.1/src/lauxlib.c b/extern/lua-5.1/src/lauxlib.c
similarity index 100%
rename from src/lua-5.1/src/lauxlib.c
rename to extern/lua-5.1/src/lauxlib.c
diff --git a/src/lua-5.1/src/lauxlib.h b/extern/lua-5.1/src/lauxlib.h
similarity index 100%
rename from src/lua-5.1/src/lauxlib.h
rename to extern/lua-5.1/src/lauxlib.h
diff --git a/src/lua-5.1/src/lbaselib.c b/extern/lua-5.1/src/lbaselib.c
similarity index 100%
rename from src/lua-5.1/src/lbaselib.c
rename to extern/lua-5.1/src/lbaselib.c
diff --git a/src/lua-5.1/src/lcode.c b/extern/lua-5.1/src/lcode.c
similarity index 100%
rename from src/lua-5.1/src/lcode.c
rename to extern/lua-5.1/src/lcode.c
diff --git a/src/lua-5.1/src/lcode.h b/extern/lua-5.1/src/lcode.h
similarity index 100%
rename from src/lua-5.1/src/lcode.h
rename to extern/lua-5.1/src/lcode.h
diff --git a/src/lua-5.1/src/ldblib.c b/extern/lua-5.1/src/ldblib.c
similarity index 100%
rename from src/lua-5.1/src/ldblib.c
rename to extern/lua-5.1/src/ldblib.c
diff --git a/src/lua-5.1/src/ldebug.c b/extern/lua-5.1/src/ldebug.c
similarity index 100%
rename from src/lua-5.1/src/ldebug.c
rename to extern/lua-5.1/src/ldebug.c
diff --git a/src/lua-5.1/src/ldebug.h b/extern/lua-5.1/src/ldebug.h
similarity index 100%
rename from src/lua-5.1/src/ldebug.h
rename to extern/lua-5.1/src/ldebug.h
diff --git a/src/lua-5.1/src/ldo.c b/extern/lua-5.1/src/ldo.c
similarity index 100%
rename from src/lua-5.1/src/ldo.c
rename to extern/lua-5.1/src/ldo.c
diff --git a/src/lua-5.1/src/ldo.h b/extern/lua-5.1/src/ldo.h
similarity index 100%
rename from src/lua-5.1/src/ldo.h
rename to extern/lua-5.1/src/ldo.h
diff --git a/src/lua-5.1/src/ldump.c b/extern/lua-5.1/src/ldump.c
similarity index 100%
rename from src/lua-5.1/src/ldump.c
rename to extern/lua-5.1/src/ldump.c
diff --git a/src/lua-5.1/src/lfunc.c b/extern/lua-5.1/src/lfunc.c
similarity index 100%
rename from src/lua-5.1/src/lfunc.c
rename to extern/lua-5.1/src/lfunc.c
diff --git a/src/lua-5.1/src/lfunc.h b/extern/lua-5.1/src/lfunc.h
similarity index 100%
rename from src/lua-5.1/src/lfunc.h
rename to extern/lua-5.1/src/lfunc.h
diff --git a/src/lua-5.1/src/lgc.c b/extern/lua-5.1/src/lgc.c
similarity index 100%
rename from src/lua-5.1/src/lgc.c
rename to extern/lua-5.1/src/lgc.c
diff --git a/src/lua-5.1/src/lgc.h b/extern/lua-5.1/src/lgc.h
similarity index 100%
rename from src/lua-5.1/src/lgc.h
rename to extern/lua-5.1/src/lgc.h
diff --git a/src/lua-5.1/src/linit.c b/extern/lua-5.1/src/linit.c
similarity index 100%
rename from src/lua-5.1/src/linit.c
rename to extern/lua-5.1/src/linit.c
diff --git a/src/lua-5.1/src/liolib.c b/extern/lua-5.1/src/liolib.c
similarity index 100%
rename from src/lua-5.1/src/liolib.c
rename to extern/lua-5.1/src/liolib.c
diff --git a/src/lua-5.1/src/llex.c b/extern/lua-5.1/src/llex.c
similarity index 100%
rename from src/lua-5.1/src/llex.c
rename to extern/lua-5.1/src/llex.c
diff --git a/src/lua-5.1/src/llex.h b/extern/lua-5.1/src/llex.h
similarity index 100%
rename from src/lua-5.1/src/llex.h
rename to extern/lua-5.1/src/llex.h
diff --git a/src/lua-5.1/src/llimits.h b/extern/lua-5.1/src/llimits.h
similarity index 100%
rename from src/lua-5.1/src/llimits.h
rename to extern/lua-5.1/src/llimits.h
diff --git a/src/lua-5.1/src/lmathlib.c b/extern/lua-5.1/src/lmathlib.c
similarity index 100%
rename from src/lua-5.1/src/lmathlib.c
rename to extern/lua-5.1/src/lmathlib.c
diff --git a/src/lua-5.1/src/lmem.c b/extern/lua-5.1/src/lmem.c
similarity index 100%
rename from src/lua-5.1/src/lmem.c
rename to extern/lua-5.1/src/lmem.c
diff --git a/src/lua-5.1/src/lmem.h b/extern/lua-5.1/src/lmem.h
similarity index 100%
rename from src/lua-5.1/src/lmem.h
rename to extern/lua-5.1/src/lmem.h
diff --git a/src/lua-5.1/src/loadlib.c b/extern/lua-5.1/src/loadlib.c
similarity index 100%
rename from src/lua-5.1/src/loadlib.c
rename to extern/lua-5.1/src/loadlib.c
diff --git a/src/lua-5.1/src/lobject.c b/extern/lua-5.1/src/lobject.c
similarity index 100%
rename from src/lua-5.1/src/lobject.c
rename to extern/lua-5.1/src/lobject.c
diff --git a/src/lua-5.1/src/lobject.h b/extern/lua-5.1/src/lobject.h
similarity index 100%
rename from src/lua-5.1/src/lobject.h
rename to extern/lua-5.1/src/lobject.h
diff --git a/src/lua-5.1/src/lopcodes.c b/extern/lua-5.1/src/lopcodes.c
similarity index 100%
rename from src/lua-5.1/src/lopcodes.c
rename to extern/lua-5.1/src/lopcodes.c
diff --git a/src/lua-5.1/src/lopcodes.h b/extern/lua-5.1/src/lopcodes.h
similarity index 100%
rename from src/lua-5.1/src/lopcodes.h
rename to extern/lua-5.1/src/lopcodes.h
diff --git a/src/lua-5.1/src/loslib.c b/extern/lua-5.1/src/loslib.c
similarity index 100%
rename from src/lua-5.1/src/loslib.c
rename to extern/lua-5.1/src/loslib.c
diff --git a/src/lua-5.1/src/lparser.c b/extern/lua-5.1/src/lparser.c
similarity index 100%
rename from src/lua-5.1/src/lparser.c
rename to extern/lua-5.1/src/lparser.c
diff --git a/src/lua-5.1/src/lparser.h b/extern/lua-5.1/src/lparser.h
similarity index 100%
rename from src/lua-5.1/src/lparser.h
rename to extern/lua-5.1/src/lparser.h
diff --git a/src/lua-5.1/src/lstate.c b/extern/lua-5.1/src/lstate.c
similarity index 100%
rename from src/lua-5.1/src/lstate.c
rename to extern/lua-5.1/src/lstate.c
diff --git a/src/lua-5.1/src/lstate.h b/extern/lua-5.1/src/lstate.h
similarity index 100%
rename from src/lua-5.1/src/lstate.h
rename to extern/lua-5.1/src/lstate.h
diff --git a/src/lua-5.1/src/lstring.c b/extern/lua-5.1/src/lstring.c
similarity index 100%
rename from src/lua-5.1/src/lstring.c
rename to extern/lua-5.1/src/lstring.c
diff --git a/src/lua-5.1/src/lstring.h b/extern/lua-5.1/src/lstring.h
similarity index 100%
rename from src/lua-5.1/src/lstring.h
rename to extern/lua-5.1/src/lstring.h
diff --git a/src/lua-5.1/src/lstrlib.c b/extern/lua-5.1/src/lstrlib.c
similarity index 100%
rename from src/lua-5.1/src/lstrlib.c
rename to extern/lua-5.1/src/lstrlib.c
diff --git a/src/lua-5.1/src/ltable.c b/extern/lua-5.1/src/ltable.c
similarity index 100%
rename from src/lua-5.1/src/ltable.c
rename to extern/lua-5.1/src/ltable.c
diff --git a/src/lua-5.1/src/ltable.h b/extern/lua-5.1/src/ltable.h
similarity index 100%
rename from src/lua-5.1/src/ltable.h
rename to extern/lua-5.1/src/ltable.h
diff --git a/src/lua-5.1/src/ltablib.c b/extern/lua-5.1/src/ltablib.c
similarity index 100%
rename from src/lua-5.1/src/ltablib.c
rename to extern/lua-5.1/src/ltablib.c
diff --git a/src/lua-5.1/src/ltm.c b/extern/lua-5.1/src/ltm.c
similarity index 100%
rename from src/lua-5.1/src/ltm.c
rename to extern/lua-5.1/src/ltm.c
diff --git a/src/lua-5.1/src/ltm.h b/extern/lua-5.1/src/ltm.h
similarity index 100%
rename from src/lua-5.1/src/ltm.h
rename to extern/lua-5.1/src/ltm.h
diff --git a/src/lua-5.1/src/lua.c b/extern/lua-5.1/src/lua.c
similarity index 100%
rename from src/lua-5.1/src/lua.c
rename to extern/lua-5.1/src/lua.c
diff --git a/src/lua-5.1/src/lua.h b/extern/lua-5.1/src/lua.h
similarity index 100%
rename from src/lua-5.1/src/lua.h
rename to extern/lua-5.1/src/lua.h
diff --git a/src/lua-5.1/src/luac.c b/extern/lua-5.1/src/luac.c
similarity index 100%
rename from src/lua-5.1/src/luac.c
rename to extern/lua-5.1/src/luac.c
diff --git a/src/lua-5.1/src/luaconf.h b/extern/lua-5.1/src/luaconf.h
similarity index 100%
rename from src/lua-5.1/src/luaconf.h
rename to extern/lua-5.1/src/luaconf.h
diff --git a/src/lua-5.1/src/lualib.h b/extern/lua-5.1/src/lualib.h
similarity index 100%
rename from src/lua-5.1/src/lualib.h
rename to extern/lua-5.1/src/lualib.h
diff --git a/src/lua-5.1/src/lundump.c b/extern/lua-5.1/src/lundump.c
similarity index 100%
rename from src/lua-5.1/src/lundump.c
rename to extern/lua-5.1/src/lundump.c
diff --git a/src/lua-5.1/src/lundump.h b/extern/lua-5.1/src/lundump.h
similarity index 100%
rename from src/lua-5.1/src/lundump.h
rename to extern/lua-5.1/src/lundump.h
diff --git a/src/lua-5.1/src/lvm.c b/extern/lua-5.1/src/lvm.c
similarity index 100%
rename from src/lua-5.1/src/lvm.c
rename to extern/lua-5.1/src/lvm.c
diff --git a/src/lua-5.1/src/lvm.h b/extern/lua-5.1/src/lvm.h
similarity index 100%
rename from src/lua-5.1/src/lvm.h
rename to extern/lua-5.1/src/lvm.h
diff --git a/src/lua-5.1/src/lzio.c b/extern/lua-5.1/src/lzio.c
similarity index 100%
rename from src/lua-5.1/src/lzio.c
rename to extern/lua-5.1/src/lzio.c
diff --git a/src/lua-5.1/src/lzio.h b/extern/lua-5.1/src/lzio.h
similarity index 100%
rename from src/lua-5.1/src/lzio.h
rename to extern/lua-5.1/src/lzio.h
diff --git a/src/lua-5.1/src/print.c b/extern/lua-5.1/src/print.c
similarity index 100%
rename from src/lua-5.1/src/print.c
rename to extern/lua-5.1/src/print.c
diff --git a/src/lua-5.1/test/README b/extern/lua-5.1/test/README
similarity index 100%
rename from src/lua-5.1/test/README
rename to extern/lua-5.1/test/README
diff --git a/src/lua-5.1/test/bisect.lua b/extern/lua-5.1/test/bisect.lua
similarity index 100%
rename from src/lua-5.1/test/bisect.lua
rename to extern/lua-5.1/test/bisect.lua
diff --git a/src/lua-5.1/test/cf.lua b/extern/lua-5.1/test/cf.lua
similarity index 100%
rename from src/lua-5.1/test/cf.lua
rename to extern/lua-5.1/test/cf.lua
diff --git a/src/lua-5.1/test/echo.lua b/extern/lua-5.1/test/echo.lua
similarity index 100%
rename from src/lua-5.1/test/echo.lua
rename to extern/lua-5.1/test/echo.lua
diff --git a/src/lua-5.1/test/env.lua b/extern/lua-5.1/test/env.lua
similarity index 100%
rename from src/lua-5.1/test/env.lua
rename to extern/lua-5.1/test/env.lua
diff --git a/src/lua-5.1/test/factorial.lua b/extern/lua-5.1/test/factorial.lua
similarity index 100%
rename from src/lua-5.1/test/factorial.lua
rename to extern/lua-5.1/test/factorial.lua
diff --git a/src/lua-5.1/test/fib.lua b/extern/lua-5.1/test/fib.lua
similarity index 100%
rename from src/lua-5.1/test/fib.lua
rename to extern/lua-5.1/test/fib.lua
diff --git a/src/lua-5.1/test/fibfor.lua b/extern/lua-5.1/test/fibfor.lua
similarity index 100%
rename from src/lua-5.1/test/fibfor.lua
rename to extern/lua-5.1/test/fibfor.lua
diff --git a/src/lua-5.1/test/globals.lua b/extern/lua-5.1/test/globals.lua
similarity index 100%
rename from src/lua-5.1/test/globals.lua
rename to extern/lua-5.1/test/globals.lua
diff --git a/src/lua-5.1/test/hello.lua b/extern/lua-5.1/test/hello.lua
similarity index 100%
rename from src/lua-5.1/test/hello.lua
rename to extern/lua-5.1/test/hello.lua
diff --git a/src/lua-5.1/test/life.lua b/extern/lua-5.1/test/life.lua
similarity index 100%
rename from src/lua-5.1/test/life.lua
rename to extern/lua-5.1/test/life.lua
diff --git a/src/lua-5.1/test/luac.lua b/extern/lua-5.1/test/luac.lua
similarity index 100%
rename from src/lua-5.1/test/luac.lua
rename to extern/lua-5.1/test/luac.lua
diff --git a/src/lua-5.1/test/printf.lua b/extern/lua-5.1/test/printf.lua
similarity index 100%
rename from src/lua-5.1/test/printf.lua
rename to extern/lua-5.1/test/printf.lua
diff --git a/src/lua-5.1/test/readonly.lua b/extern/lua-5.1/test/readonly.lua
similarity index 100%
rename from src/lua-5.1/test/readonly.lua
rename to extern/lua-5.1/test/readonly.lua
diff --git a/src/lua-5.1/test/sieve.lua b/extern/lua-5.1/test/sieve.lua
similarity index 100%
rename from src/lua-5.1/test/sieve.lua
rename to extern/lua-5.1/test/sieve.lua
diff --git a/src/lua-5.1/test/sort.lua b/extern/lua-5.1/test/sort.lua
similarity index 100%
rename from src/lua-5.1/test/sort.lua
rename to extern/lua-5.1/test/sort.lua
diff --git a/src/lua-5.1/test/table.lua b/extern/lua-5.1/test/table.lua
similarity index 100%
rename from src/lua-5.1/test/table.lua
rename to extern/lua-5.1/test/table.lua
diff --git a/src/lua-5.1/test/trace-calls.lua b/extern/lua-5.1/test/trace-calls.lua
similarity index 100%
rename from src/lua-5.1/test/trace-calls.lua
rename to extern/lua-5.1/test/trace-calls.lua
diff --git a/src/lua-5.1/test/trace-globals.lua b/extern/lua-5.1/test/trace-globals.lua
similarity index 100%
rename from src/lua-5.1/test/trace-globals.lua
rename to extern/lua-5.1/test/trace-globals.lua
diff --git a/src/lua-5.1/test/xd.lua b/extern/lua-5.1/test/xd.lua
similarity index 100%
rename from src/lua-5.1/test/xd.lua
rename to extern/lua-5.1/test/xd.lua
diff --git a/src/mad-0.15.1b/CHANGES b/extern/mad-0.15.1b/CHANGES
similarity index 100%
rename from src/mad-0.15.1b/CHANGES
rename to extern/mad-0.15.1b/CHANGES
diff --git a/src/mad-0.15.1b/COPYING b/extern/mad-0.15.1b/COPYING
similarity index 100%
rename from src/mad-0.15.1b/COPYING
rename to extern/mad-0.15.1b/COPYING
diff --git a/src/mad-0.15.1b/COPYRIGHT b/extern/mad-0.15.1b/COPYRIGHT
similarity index 100%
rename from src/mad-0.15.1b/COPYRIGHT
rename to extern/mad-0.15.1b/COPYRIGHT
diff --git a/src/mad-0.15.1b/CREDITS b/extern/mad-0.15.1b/CREDITS
similarity index 100%
rename from src/mad-0.15.1b/CREDITS
rename to extern/mad-0.15.1b/CREDITS
diff --git a/src/mad-0.15.1b/D.dat b/extern/mad-0.15.1b/D.dat
similarity index 100%
rename from src/mad-0.15.1b/D.dat
rename to extern/mad-0.15.1b/D.dat
diff --git a/src/mad-0.15.1b/INSTALL b/extern/mad-0.15.1b/INSTALL
similarity index 100%
rename from src/mad-0.15.1b/INSTALL
rename to extern/mad-0.15.1b/INSTALL
diff --git a/src/mad-0.15.1b/Makefile.am b/extern/mad-0.15.1b/Makefile.am
similarity index 100%
rename from src/mad-0.15.1b/Makefile.am
rename to extern/mad-0.15.1b/Makefile.am
diff --git a/src/mad-0.15.1b/README b/extern/mad-0.15.1b/README
similarity index 100%
rename from src/mad-0.15.1b/README
rename to extern/mad-0.15.1b/README
diff --git a/src/mad-0.15.1b/TODO b/extern/mad-0.15.1b/TODO
similarity index 100%
rename from src/mad-0.15.1b/TODO
rename to extern/mad-0.15.1b/TODO
diff --git a/src/mad-0.15.1b/VERSION b/extern/mad-0.15.1b/VERSION
similarity index 100%
rename from src/mad-0.15.1b/VERSION
rename to extern/mad-0.15.1b/VERSION
diff --git a/src/mad-0.15.1b/bit.c b/extern/mad-0.15.1b/bit.c
similarity index 100%
rename from src/mad-0.15.1b/bit.c
rename to extern/mad-0.15.1b/bit.c
diff --git a/src/mad-0.15.1b/bit.h b/extern/mad-0.15.1b/bit.h
similarity index 100%
rename from src/mad-0.15.1b/bit.h
rename to extern/mad-0.15.1b/bit.h
diff --git a/src/mad-0.15.1b/config.guess b/extern/mad-0.15.1b/config.guess
similarity index 100%
rename from src/mad-0.15.1b/config.guess
rename to extern/mad-0.15.1b/config.guess
diff --git a/src/mad-0.15.1b/config.h.in b/extern/mad-0.15.1b/config.h.in
similarity index 100%
rename from src/mad-0.15.1b/config.h.in
rename to extern/mad-0.15.1b/config.h.in
diff --git a/src/mad-0.15.1b/config.sub b/extern/mad-0.15.1b/config.sub
similarity index 100%
rename from src/mad-0.15.1b/config.sub
rename to extern/mad-0.15.1b/config.sub
diff --git a/src/mad-0.15.1b/configure.ac b/extern/mad-0.15.1b/configure.ac
similarity index 100%
rename from src/mad-0.15.1b/configure.ac
rename to extern/mad-0.15.1b/configure.ac
diff --git a/src/mad-0.15.1b/decoder.c b/extern/mad-0.15.1b/decoder.c
similarity index 100%
rename from src/mad-0.15.1b/decoder.c
rename to extern/mad-0.15.1b/decoder.c
diff --git a/src/mad-0.15.1b/decoder.h b/extern/mad-0.15.1b/decoder.h
similarity index 100%
rename from src/mad-0.15.1b/decoder.h
rename to extern/mad-0.15.1b/decoder.h
diff --git a/src/mad-0.15.1b/depcomp b/extern/mad-0.15.1b/depcomp
similarity index 100%
rename from src/mad-0.15.1b/depcomp
rename to extern/mad-0.15.1b/depcomp
diff --git a/src/mad-0.15.1b/fixed.c b/extern/mad-0.15.1b/fixed.c
similarity index 100%
rename from src/mad-0.15.1b/fixed.c
rename to extern/mad-0.15.1b/fixed.c
diff --git a/src/mad-0.15.1b/fixed.h b/extern/mad-0.15.1b/fixed.h
similarity index 100%
rename from src/mad-0.15.1b/fixed.h
rename to extern/mad-0.15.1b/fixed.h
diff --git a/src/mad-0.15.1b/frame.c b/extern/mad-0.15.1b/frame.c
similarity index 100%
rename from src/mad-0.15.1b/frame.c
rename to extern/mad-0.15.1b/frame.c
diff --git a/src/mad-0.15.1b/frame.h b/extern/mad-0.15.1b/frame.h
similarity index 100%
rename from src/mad-0.15.1b/frame.h
rename to extern/mad-0.15.1b/frame.h
diff --git a/src/mad-0.15.1b/global.h b/extern/mad-0.15.1b/global.h
similarity index 100%
rename from src/mad-0.15.1b/global.h
rename to extern/mad-0.15.1b/global.h
diff --git a/src/mad-0.15.1b/huffman.c b/extern/mad-0.15.1b/huffman.c
similarity index 100%
rename from src/mad-0.15.1b/huffman.c
rename to extern/mad-0.15.1b/huffman.c
diff --git a/src/mad-0.15.1b/huffman.h b/extern/mad-0.15.1b/huffman.h
similarity index 100%
rename from src/mad-0.15.1b/huffman.h
rename to extern/mad-0.15.1b/huffman.h
diff --git a/src/mad-0.15.1b/imdct_l_arm.S b/extern/mad-0.15.1b/imdct_l_arm.S
similarity index 100%
rename from src/mad-0.15.1b/imdct_l_arm.S
rename to extern/mad-0.15.1b/imdct_l_arm.S
diff --git a/src/mad-0.15.1b/imdct_s.dat b/extern/mad-0.15.1b/imdct_s.dat
similarity index 100%
rename from src/mad-0.15.1b/imdct_s.dat
rename to extern/mad-0.15.1b/imdct_s.dat
diff --git a/src/mad-0.15.1b/install-sh b/extern/mad-0.15.1b/install-sh
similarity index 100%
rename from src/mad-0.15.1b/install-sh
rename to extern/mad-0.15.1b/install-sh
diff --git a/src/mad-0.15.1b/layer12.c b/extern/mad-0.15.1b/layer12.c
similarity index 100%
rename from src/mad-0.15.1b/layer12.c
rename to extern/mad-0.15.1b/layer12.c
diff --git a/src/mad-0.15.1b/layer12.h b/extern/mad-0.15.1b/layer12.h
similarity index 100%
rename from src/mad-0.15.1b/layer12.h
rename to extern/mad-0.15.1b/layer12.h
diff --git a/src/mad-0.15.1b/layer3.c b/extern/mad-0.15.1b/layer3.c
similarity index 100%
rename from src/mad-0.15.1b/layer3.c
rename to extern/mad-0.15.1b/layer3.c
diff --git a/src/mad-0.15.1b/layer3.h b/extern/mad-0.15.1b/layer3.h
similarity index 100%
rename from src/mad-0.15.1b/layer3.h
rename to extern/mad-0.15.1b/layer3.h
diff --git a/src/mad-0.15.1b/libmad.list.in b/extern/mad-0.15.1b/libmad.list.in
similarity index 100%
rename from src/mad-0.15.1b/libmad.list.in
rename to extern/mad-0.15.1b/libmad.list.in
diff --git a/src/mad-0.15.1b/ltmain.sh b/extern/mad-0.15.1b/ltmain.sh
similarity index 100%
rename from src/mad-0.15.1b/ltmain.sh
rename to extern/mad-0.15.1b/ltmain.sh
diff --git a/src/mad-0.15.1b/mad.h b/extern/mad-0.15.1b/mad.h
similarity index 100%
rename from src/mad-0.15.1b/mad.h
rename to extern/mad-0.15.1b/mad.h
diff --git a/src/mad-0.15.1b/mad.h.sed b/extern/mad-0.15.1b/mad.h.sed
similarity index 100%
rename from src/mad-0.15.1b/mad.h.sed
rename to extern/mad-0.15.1b/mad.h.sed
diff --git a/src/mad-0.15.1b/minimad.c b/extern/mad-0.15.1b/minimad.c
similarity index 100%
rename from src/mad-0.15.1b/minimad.c
rename to extern/mad-0.15.1b/minimad.c
diff --git a/src/mad-0.15.1b/missing b/extern/mad-0.15.1b/missing
similarity index 100%
rename from src/mad-0.15.1b/missing
rename to extern/mad-0.15.1b/missing
diff --git a/src/mad-0.15.1b/mkinstalldirs b/extern/mad-0.15.1b/mkinstalldirs
similarity index 100%
rename from src/mad-0.15.1b/mkinstalldirs
rename to extern/mad-0.15.1b/mkinstalldirs
diff --git a/src/mad-0.15.1b/msvc++/Makefile.am b/extern/mad-0.15.1b/msvc++/Makefile.am
similarity index 100%
rename from src/mad-0.15.1b/msvc++/Makefile.am
rename to extern/mad-0.15.1b/msvc++/Makefile.am
diff --git a/src/mad-0.15.1b/msvc++/Release/libmad.lib b/extern/mad-0.15.1b/msvc++/Release/libmad.lib
similarity index 100%
rename from src/mad-0.15.1b/msvc++/Release/libmad.lib
rename to extern/mad-0.15.1b/msvc++/Release/libmad.lib
diff --git a/src/mad-0.15.1b/msvc++/config.h b/extern/mad-0.15.1b/msvc++/config.h
similarity index 100%
rename from src/mad-0.15.1b/msvc++/config.h
rename to extern/mad-0.15.1b/msvc++/config.h
diff --git a/src/mad-0.15.1b/msvc++/libmad.dsp b/extern/mad-0.15.1b/msvc++/libmad.dsp
similarity index 100%
rename from src/mad-0.15.1b/msvc++/libmad.dsp
rename to extern/mad-0.15.1b/msvc++/libmad.dsp
diff --git a/src/mad-0.15.1b/msvc++/libmad.dsw b/extern/mad-0.15.1b/msvc++/libmad.dsw
similarity index 100%
rename from src/mad-0.15.1b/msvc++/libmad.dsw
rename to extern/mad-0.15.1b/msvc++/libmad.dsw
diff --git a/src/mad-0.15.1b/msvc++/mad.h b/extern/mad-0.15.1b/msvc++/mad.h
similarity index 100%
rename from src/mad-0.15.1b/msvc++/mad.h
rename to extern/mad-0.15.1b/msvc++/mad.h
diff --git a/src/mad-0.15.1b/qc_table.dat b/extern/mad-0.15.1b/qc_table.dat
similarity index 100%
rename from src/mad-0.15.1b/qc_table.dat
rename to extern/mad-0.15.1b/qc_table.dat
diff --git a/src/mad-0.15.1b/rq_table.dat b/extern/mad-0.15.1b/rq_table.dat
similarity index 100%
rename from src/mad-0.15.1b/rq_table.dat
rename to extern/mad-0.15.1b/rq_table.dat
diff --git a/src/mad-0.15.1b/sf_table.dat b/extern/mad-0.15.1b/sf_table.dat
similarity index 100%
rename from src/mad-0.15.1b/sf_table.dat
rename to extern/mad-0.15.1b/sf_table.dat
diff --git a/src/mad-0.15.1b/stream.c b/extern/mad-0.15.1b/stream.c
similarity index 100%
rename from src/mad-0.15.1b/stream.c
rename to extern/mad-0.15.1b/stream.c
diff --git a/src/mad-0.15.1b/stream.h b/extern/mad-0.15.1b/stream.h
similarity index 100%
rename from src/mad-0.15.1b/stream.h
rename to extern/mad-0.15.1b/stream.h
diff --git a/src/mad-0.15.1b/synth.c b/extern/mad-0.15.1b/synth.c
similarity index 100%
rename from src/mad-0.15.1b/synth.c
rename to extern/mad-0.15.1b/synth.c
diff --git a/src/mad-0.15.1b/synth.h b/extern/mad-0.15.1b/synth.h
similarity index 100%
rename from src/mad-0.15.1b/synth.h
rename to extern/mad-0.15.1b/synth.h
diff --git a/src/mad-0.15.1b/timer.c b/extern/mad-0.15.1b/timer.c
similarity index 100%
rename from src/mad-0.15.1b/timer.c
rename to extern/mad-0.15.1b/timer.c
diff --git a/src/mad-0.15.1b/timer.h b/extern/mad-0.15.1b/timer.h
similarity index 100%
rename from src/mad-0.15.1b/timer.h
rename to extern/mad-0.15.1b/timer.h
diff --git a/src/mad-0.15.1b/version.c b/extern/mad-0.15.1b/version.c
similarity index 100%
rename from src/mad-0.15.1b/version.c
rename to extern/mad-0.15.1b/version.c
diff --git a/src/mad-0.15.1b/version.h b/extern/mad-0.15.1b/version.h
similarity index 100%
rename from src/mad-0.15.1b/version.h
rename to extern/mad-0.15.1b/version.h
diff --git a/src/mad-0.15.1b/xboxmad/config.h b/extern/mad-0.15.1b/xboxmad/config.h
similarity index 100%
rename from src/mad-0.15.1b/xboxmad/config.h
rename to extern/mad-0.15.1b/xboxmad/config.h
diff --git a/src/mad-0.15.1b/xboxmad/xboxmad-2003.sln b/extern/mad-0.15.1b/xboxmad/xboxmad-2003.sln
similarity index 100%
rename from src/mad-0.15.1b/xboxmad/xboxmad-2003.sln
rename to extern/mad-0.15.1b/xboxmad/xboxmad-2003.sln
diff --git a/src/mad-0.15.1b/xboxmad/xboxmad-2003.vcproj b/extern/mad-0.15.1b/xboxmad/xboxmad-2003.vcproj
similarity index 100%
rename from src/mad-0.15.1b/xboxmad/xboxmad-2003.vcproj
rename to extern/mad-0.15.1b/xboxmad/xboxmad-2003.vcproj
diff --git a/src/mad-0.15.1b/xboxmad/xboxmad.sln b/extern/mad-0.15.1b/xboxmad/xboxmad.sln
similarity index 100%
rename from src/mad-0.15.1b/xboxmad/xboxmad.sln
rename to extern/mad-0.15.1b/xboxmad/xboxmad.sln
diff --git a/src/mad-0.15.1b/xboxmad/xboxmad.vcproj b/extern/mad-0.15.1b/xboxmad/xboxmad.vcproj
similarity index 100%
rename from src/mad-0.15.1b/xboxmad/xboxmad.vcproj
rename to extern/mad-0.15.1b/xboxmad/xboxmad.vcproj
diff --git a/src/pcre/COPYING b/extern/pcre/COPYING
similarity index 100%
rename from src/pcre/COPYING
rename to extern/pcre/COPYING
diff --git a/src/pcre/chartables.c b/extern/pcre/chartables.c
similarity index 100%
rename from src/pcre/chartables.c
rename to extern/pcre/chartables.c
diff --git a/src/pcre/get.c b/extern/pcre/get.c
similarity index 100%
rename from src/pcre/get.c
rename to extern/pcre/get.c
diff --git a/src/pcre/internal.h b/extern/pcre/internal.h
similarity index 100%
rename from src/pcre/internal.h
rename to extern/pcre/internal.h
diff --git a/src/pcre/maketables.c b/extern/pcre/maketables.c
similarity index 100%
rename from src/pcre/maketables.c
rename to extern/pcre/maketables.c
diff --git a/src/pcre/pcre.c b/extern/pcre/pcre.c
similarity index 100%
rename from src/pcre/pcre.c
rename to extern/pcre/pcre.c
diff --git a/src/pcre/pcre.h b/extern/pcre/pcre.h
similarity index 100%
rename from src/pcre/pcre.h
rename to extern/pcre/pcre.h
diff --git a/src/pcre/printint.c b/extern/pcre/printint.c
similarity index 100%
rename from src/pcre/printint.c
rename to extern/pcre/printint.c
diff --git a/src/pcre/study.c b/extern/pcre/study.c
similarity index 100%
rename from src/pcre/study.c
rename to extern/pcre/study.c
diff --git a/src/vorbis/ogg/ogg.h b/extern/vorbis/ogg/ogg.h
similarity index 99%
rename from src/vorbis/ogg/ogg.h
rename to extern/vorbis/ogg/ogg.h
index fdcb995f66..60178dfc6a 100644
--- a/src/vorbis/ogg/ogg.h
+++ b/extern/vorbis/ogg/ogg.h
@@ -21,7 +21,7 @@
extern "C" {
#endif
-#include
+#include <../extern/vorbis/ogg/os_types.h>
typedef struct {
long endbyte;
diff --git a/src/vorbis/ogg/os_types.h b/extern/vorbis/ogg/os_types.h
similarity index 100%
rename from src/vorbis/ogg/os_types.h
rename to extern/vorbis/ogg/os_types.h
diff --git a/src/vorbis/theora/codec.h b/extern/vorbis/theora/codec.h
similarity index 100%
rename from src/vorbis/theora/codec.h
rename to extern/vorbis/theora/codec.h
diff --git a/src/vorbis/theora/theora.h b/extern/vorbis/theora/theora.h
similarity index 99%
rename from src/vorbis/theora/theora.h
rename to extern/vorbis/theora/theora.h
index 503221453d..18208d1033 100644
--- a/src/vorbis/theora/theora.h
+++ b/extern/vorbis/theora/theora.h
@@ -24,9 +24,9 @@ extern "C"
#endif /* __cplusplus */
#ifndef LIBOGG2
-#include
+#include <../extern/vorbis/ogg/ogg.h>
#else
-#include
+#include <../extern/vorbis/ogg2/ogg.h>
/* This is temporary until libogg2 is more complete */
ogg_buffer_state *ogg_buffer_create(void);
#endif
diff --git a/src/vorbis/theora/theoradec.h b/extern/vorbis/theora/theoradec.h
similarity index 100%
rename from src/vorbis/theora/theoradec.h
rename to extern/vorbis/theora/theoradec.h
diff --git a/src/vorbis/vorbis/codec.h b/extern/vorbis/vorbis/codec.h
similarity index 99%
rename from src/vorbis/vorbis/codec.h
rename to extern/vorbis/vorbis/codec.h
index fb4faeddfc..8928cb4756 100644
--- a/src/vorbis/vorbis/codec.h
+++ b/extern/vorbis/vorbis/codec.h
@@ -23,7 +23,7 @@ extern "C"
{
#endif /* __cplusplus */
-#include
+#include <../extern/vorbis/ogg/ogg.h>
typedef struct vorbis_info{
int version;
diff --git a/src/vorbis/vorbis/vorbisfile.h b/extern/vorbis/vorbis/vorbisfile.h
similarity index 100%
rename from src/vorbis/vorbis/vorbisfile.h
rename to extern/vorbis/vorbis/vorbisfile.h
diff --git a/src/vorbis/win32/ogg_static.lib b/extern/vorbis/win32/ogg_static.lib
similarity index 100%
rename from src/vorbis/win32/ogg_static.lib
rename to extern/vorbis/win32/ogg_static.lib
diff --git a/src/vorbis/win32/theora_static.lib b/extern/vorbis/win32/theora_static.lib
similarity index 100%
rename from src/vorbis/win32/theora_static.lib
rename to extern/vorbis/win32/theora_static.lib
diff --git a/src/vorbis/win32/vorbis_static.lib b/extern/vorbis/win32/vorbis_static.lib
similarity index 100%
rename from src/vorbis/win32/vorbis_static.lib
rename to extern/vorbis/win32/vorbis_static.lib
diff --git a/src/vorbis/win32/vorbisfile_static.lib b/extern/vorbis/win32/vorbisfile_static.lib
similarity index 100%
rename from src/vorbis/win32/vorbisfile_static.lib
rename to extern/vorbis/win32/vorbisfile_static.lib
diff --git a/src/vorbis/xbox/Debug/ogg_static.lib b/extern/vorbis/xbox/Debug/ogg_static.lib
similarity index 100%
rename from src/vorbis/xbox/Debug/ogg_static.lib
rename to extern/vorbis/xbox/Debug/ogg_static.lib
diff --git a/src/vorbis/xbox/Debug/vorbis_static.lib b/extern/vorbis/xbox/Debug/vorbis_static.lib
similarity index 100%
rename from src/vorbis/xbox/Debug/vorbis_static.lib
rename to extern/vorbis/xbox/Debug/vorbis_static.lib
diff --git a/src/vorbis/xbox/Debug/vorbisfile_static.lib b/extern/vorbis/xbox/Debug/vorbisfile_static.lib
similarity index 100%
rename from src/vorbis/xbox/Debug/vorbisfile_static.lib
rename to extern/vorbis/xbox/Debug/vorbisfile_static.lib
diff --git a/src/vorbis/xbox/Release/ogg_static.lib b/extern/vorbis/xbox/Release/ogg_static.lib
similarity index 100%
rename from src/vorbis/xbox/Release/ogg_static.lib
rename to extern/vorbis/xbox/Release/ogg_static.lib
diff --git a/src/vorbis/xbox/Release/vorbis_static.lib b/extern/vorbis/xbox/Release/vorbis_static.lib
similarity index 100%
rename from src/vorbis/xbox/Release/vorbis_static.lib
rename to extern/vorbis/xbox/Release/vorbis_static.lib
diff --git a/src/vorbis/xbox/Release/vorbisfile_static.lib b/extern/vorbis/xbox/Release/vorbisfile_static.lib
similarity index 100%
rename from src/vorbis/xbox/Release/vorbisfile_static.lib
rename to extern/vorbis/xbox/Release/vorbisfile_static.lib
diff --git a/src/zlib/000 StepMania README.txt b/extern/zlib/000 StepMania README.txt
similarity index 100%
rename from src/zlib/000 StepMania README.txt
rename to extern/zlib/000 StepMania README.txt
diff --git a/src/zlib/xboxzlib.lib b/extern/zlib/xboxzlib.lib
similarity index 100%
rename from src/zlib/xboxzlib.lib
rename to extern/zlib/xboxzlib.lib
diff --git a/src/zlib/zconf.h b/extern/zlib/zconf.h
similarity index 100%
rename from src/zlib/zconf.h
rename to extern/zlib/zconf.h
diff --git a/src/zlib/zdll.lib b/extern/zlib/zdll.lib
similarity index 100%
rename from src/zlib/zdll.lib
rename to extern/zlib/zdll.lib
diff --git a/src/zlib/zlib.h b/extern/zlib/zlib.h
similarity index 100%
rename from src/zlib/zlib.h
rename to extern/zlib/zlib.h
diff --git a/src/Actor.h b/src/Actor.h
index e0795e310f..45d080dabe 100644
--- a/src/Actor.h
+++ b/src/Actor.h
@@ -99,6 +99,9 @@ class Actor : public MessageSubscriber
public:
/** @brief Set up the Actor with its initial settings. */
Actor();
+ /**
+ * @brief Copy a new Actor to the old one.
+ * @param cpy the new Actor to use in place of this one. */
Actor( const Actor &cpy );
virtual ~Actor();
virtual Actor *Copy() const;
@@ -218,11 +221,35 @@ public:
float aux;
};
- void Draw(); // calls, EarlyAbortDraw, BeginDraw, DrawPrimitives, EndDraw
- virtual bool EarlyAbortDraw() const { return false; } // return true to early abort drawing of this Actor
- virtual void BeginDraw(); // pushes transform onto world matrix stack
- virtual void SetGlobalRenderStates(); // Actor should call this at beginning of their DrawPrimitives()
- virtual void SetTextureRenderStates(); // Actor should call this after setting a texture
+ /**
+ * @brief Calls multiple functions for drawing the Actors.
+ *
+ * It calls the following in order:
+ * -# EarlyAbortDraw
+ * -# BeginDraw
+ * -# DrawPrimitives
+ * -# EndDraw
+ */
+ void Draw();
+ /**
+ * @brief Allow the Actor to be aborted early.
+ *
+ * Subclasses may wish to overwrite this to allow for
+ * aborted actors.
+ * @return false, as by default Actors shouldn't be aborted on drawing. */
+ virtual bool EarlyAbortDraw() const { return false; }
+ /** @brief Start the drawing and push the transform on the world matrix stack. */
+ virtual void BeginDraw();
+ /**
+ * @brief Set the global rendering states of this Actor.
+ *
+ * This should be called at the beginning of an Actor's DrawPrimitives() call. */
+ virtual void SetGlobalRenderStates();
+ /**
+ * @brief Set the texture rendering states of this Actor.
+ *
+ * This should be called after setting a texture for the Actor. */
+ virtual void SetTextureRenderStates();
/**
* @brief Draw the primitives of the Actor.
*
@@ -331,9 +358,26 @@ public:
* @brief Retrieve the zoom factor for the z coordinate of the Actor.
* @return the zoom factor for the z coordinate of the Actor. */
float GetZoomZ() const { return DestTweenState().scale.z; }
- void SetZoom( float zoom ) { DestTweenState().scale.x = zoom; DestTweenState().scale.y = zoom; DestTweenState().scale.z = zoom; }
+ /**
+ * @brief Set the zoom factor for all dimensions of the Actor.
+ * @param zoom the zoom factor for all dimensions. */
+ void SetZoom( float zoom )
+ {
+ DestTweenState().scale.x = zoom;
+ DestTweenState().scale.y = zoom;
+ DestTweenState().scale.z = zoom;
+ }
+ /**
+ * @brief Set the zoom factor for the x dimension of the Actor.
+ * @param zoom the zoom factor for the x dimension. */
void SetZoomX( float zoom ) { DestTweenState().scale.x = zoom; }
+ /**
+ * @brief Set the zoom factor for the y dimension of the Actor.
+ * @param zoom the zoom factor for the y dimension. */
void SetZoomY( float zoom ) { DestTweenState().scale.y = zoom; }
+ /**
+ * @brief Set the zoom factor for the z dimension of the Actor.
+ * @param zoom the zoom factor for the z dimension. */
void SetZoomZ( float zoom ) { DestTweenState().scale.z = zoom; }
void ZoomTo( float fX, float fY ) { ZoomToWidth(fX); ZoomToHeight(fY); }
void ZoomToWidth( float zoom ) { SetZoomX( zoom / GetUnzoomedWidth() ); }
@@ -420,7 +464,7 @@ public:
enum StretchType
{
fit_inside, /**< Have the Actor fit inside its parent, using the smaller zoom. */
- cover /**, Have the Actor cover its parent, using the larger zoom. */
+ cover /**< Have the Actor cover its parent, using the larger zoom. */
};
void ScaleToCover( const RectF &rect ) { ScaleTo( rect, cover ); }
diff --git a/src/EnumHelper.h b/src/EnumHelper.h
index b00c381dfe..57e81d16c4 100644
--- a/src/EnumHelper.h
+++ b/src/EnumHelper.h
@@ -7,7 +7,7 @@
extern "C"
{
-#include "lua-5.1/src/lua.h"
+#include "../extern/lua-5.1/src/lua.h"
}
/** @brief A general foreach loop for enumerators, going up to a max value. */
diff --git a/src/GameCommand.cpp b/src/GameCommand.cpp
index 6897956d6f..2341aaa088 100644
--- a/src/GameCommand.cpp
+++ b/src/GameCommand.cpp
@@ -415,8 +415,8 @@ void GameCommand::LoadOne( const Command& cmd )
if( cmd.m_vsArgs.size() == 3 )
{
m_bFadeMusic = true;
- m_fMusicFadeOutVolume = atof( cmd.m_vsArgs[1] );
- m_fMusicFadeOutSeconds = atof( cmd.m_vsArgs[2] );
+ m_fMusicFadeOutVolume = static_cast(atof( cmd.m_vsArgs[1] ));
+ m_fMusicFadeOutSeconds = static_cast(atof( cmd.m_vsArgs[2] ));
}
}
diff --git a/src/JsonUtil.cpp b/src/JsonUtil.cpp
index accdff6526..e7eb597e21 100644
--- a/src/JsonUtil.cpp
+++ b/src/JsonUtil.cpp
@@ -4,8 +4,8 @@
#include "RageUtil.h"
#include "RageLog.h"
#include "arch/Dialog/Dialog.h"
-#include "jsoncpp/include/json/reader.h"
-#include "jsoncpp/include/json/writer.h"
+#include "../extern/jsoncpp/include/json/reader.h"
+#include "../extern/jsoncpp/include/json/writer.h"
bool JsonUtil::LoadFromString(Json::Value &root, RString sData, RString &sErrorOut)
{
diff --git a/src/JsonUtil.h b/src/JsonUtil.h
index d3ba953598..8c17bb1af2 100644
--- a/src/JsonUtil.h
+++ b/src/JsonUtil.h
@@ -2,7 +2,7 @@
#define JsonUtil_H
class RageFileBasic;
-#include "jsoncpp/include/json/value.h"
+#include "../extern/jsoncpp/include/json/value.h"
/** @brief Utilities for handling JSON data. */
namespace JsonUtil
{
diff --git a/src/LuaManager.h b/src/LuaManager.h
index e723086f91..5bcf0233eb 100644
--- a/src/LuaManager.h
+++ b/src/LuaManager.h
@@ -10,9 +10,9 @@ class LuaReference;
extern "C"
{
-#include "lua-5.1/src/lua.h"
-#include "lua-5.1/src/lualib.h"
-#include "lua-5.1/src/lauxlib.h"
+#include "../extern/lua-5.1/src/lua.h"
+#include "../extern/lua-5.1/src/lualib.h"
+#include "../extern/lua-5.1/src/lauxlib.h"
}
class LuaManager
diff --git a/src/NoteField.cpp b/src/NoteField.cpp
index d321c0ad26..6895b07234 100644
--- a/src/NoteField.cpp
+++ b/src/NoteField.cpp
@@ -426,6 +426,7 @@ static ThemeMetric WARP_COLOR ( "NoteField", "WarpColor" );
static ThemeMetric TIME_SIGNATURE_COLOR ( "NoteField", "TimeSignatureColor" );
static ThemeMetric TICKCOUNT_COLOR ( "NoteField", "TickcountColor" );
static ThemeMetric COMBO_COLOR ( "NoteField", "ComboColor" );
+static ThemeMetric LABEL_COLOR ( "NoteField", "LabelColor" );
static ThemeMetric BPM_IS_LEFT_SIDE ( "NoteField", "BPMIsLeftSide" );
static ThemeMetric STOP_IS_LEFT_SIDE ( "NoteField", "StopIsLeftSide" );
static ThemeMetric DELAY_IS_LEFT_SIDE ( "NoteField", "DelayIsLeftSide" );
@@ -433,6 +434,7 @@ static ThemeMetric WARP_IS_LEFT_SIDE ( "NoteField", "WarpIsLeftSide" );
static ThemeMetric TIME_SIGNATURE_IS_LEFT_SIDE ( "NoteField", "TimeSignatureIsLeftSide" );
static ThemeMetric TICKCOUNT_IS_LEFT_SIDE ( "NoteField", "TickcountIsLeftSide" );
static ThemeMetric COMBO_IS_LEFT_SIDE ( "NoteField", "ComboIsLeftSide" );
+static ThemeMetric LABEL_IS_LEFT_SIDE ( "NoteField", "LabelIsLeftSide" );
static ThemeMetric BPM_OFFSETX ( "NoteField", "BPMOffsetX" );
static ThemeMetric STOP_OFFSETX ( "NoteField", "StopOffsetX" );
static ThemeMetric DELAY_OFFSETX ( "NoteField", "DelayOffsetX" );
@@ -440,6 +442,7 @@ static ThemeMetric WARP_OFFSETX ( "NoteField", "WarpOffsetX" );
static ThemeMetric TIME_SIGNATURE_OFFSETX ( "NoteField", "TimeSignatureOffsetX" );
static ThemeMetric TICKCOUNT_OFFSETX ( "NoteField", "TickcountOffsetX" );
static ThemeMetric COMBO_OFFSETX ( "NoteField", "ComboOffsetX" );
+static ThemeMetric LABEL_OFFSETX ( "NoteField", "LabelOffsetX" );
void NoteField::DrawBPMText( const float fBeat, const float fBPM )
{
@@ -552,6 +555,23 @@ void NoteField::DrawComboText( const float fBeat, int iCombo )
m_textMeasureNumber.Draw();
}
+void NoteField::DrawLabelText( const float fBeat, RString sLabel )
+{
+ const float fYOffset = ArrowEffects::GetYOffset( m_pPlayerState, 0, fBeat );
+ const float fYPos = ArrowEffects::GetYPos( m_pPlayerState, 0, fYOffset, m_fYReverseOffsetPixels );
+ const float fZoom = ArrowEffects::GetZoom( m_pPlayerState );
+ const float xBase = GetWidth()/2.f;
+ const float xOffset = LABEL_OFFSETX * fZoom;
+
+ m_textMeasureNumber.SetZoom( fZoom );
+ m_textMeasureNumber.SetHorizAlign( LABEL_IS_LEFT_SIDE ? align_right : align_left );
+ m_textMeasureNumber.SetDiffuse( LABEL_COLOR );
+ m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) );
+ m_textMeasureNumber.SetText( sLabel.c_str() );
+ m_textMeasureNumber.SetXY( (LABEL_IS_LEFT_SIDE ? -xBase - xOffset : xBase + xOffset), fYPos );
+ m_textMeasureNumber.Draw();
+}
+
void NoteField::DrawAttackText( const float fBeat, const Attack &attack )
{
const float fYOffset = ArrowEffects::GetYOffset( m_pPlayerState, 0, fBeat );
@@ -830,6 +850,17 @@ void NoteField::DrawPrimitives()
DrawComboText( fBeat, seg->m_iCombo );
}
}
+
+ // Label text
+ FOREACH_CONST( LabelSegment, GAMESTATE->m_pCurSong->m_Timing.m_LabelSegments, seg )
+ {
+ if( seg->m_iStartRow >= iFirstRowToDraw && seg->m_iStartRow <= iLastRowToDraw )
+ {
+ float fBeat = NoteRowToBeat(seg->m_iStartRow);
+ if( IS_ON_SCREEN(fBeat) )
+ DrawLabelText( fBeat, seg->m_sLabel );
+ }
+ }
// Course mods text
const Course *pCourse = GAMESTATE->m_pCurCourse;
diff --git a/src/NoteField.h b/src/NoteField.h
index 08a83e11aa..23502eca00 100644
--- a/src/NoteField.h
+++ b/src/NoteField.h
@@ -61,6 +61,7 @@ protected:
void DrawTimeSignatureText( const float fBeat, int iNumerator, int iDenominator );
void DrawTickcountText( const float fBeat, int iTicks );
void DrawComboText( const float fBeat, int iCombo );
+ void DrawLabelText( const float fBeat, RString sLabel );
void DrawAttackText( const float fBeat, const Attack &attack );
void DrawBGChangeText( const float fBeat, const RString sNewBGName );
float GetWidth() const;
diff --git a/src/NotesLoaderSM.cpp b/src/NotesLoaderSM.cpp
index 7fa211df32..f1ab8ec5ad 100644
--- a/src/NotesLoaderSM.cpp
+++ b/src/NotesLoaderSM.cpp
@@ -10,6 +10,7 @@
#include "Song.h"
#include "SongManager.h"
#include "Steps.h"
+#include "Attack.h"
#include "PrefsManager.h"
/** @brief The maximum file size for edits. */
@@ -468,7 +469,7 @@ bool SMLoader::LoadFromSMFile( const RString &sPath, Song &out, bool bFromCache
// handle the data
/* Don't use GetMainAndSubTitlesFromFullTitle; that's only for heuristically
- * splitting other formats that *don't* natively support #SUBTITLE. */
+ * splitting other formats that *don't* natively support #SUBTITLE. */
if( sValueName=="TITLE" )
out.m_sMainTitle = sParams[1];
@@ -540,7 +541,7 @@ bool SMLoader::LoadFromSMFile( const RString &sPath, Song &out, bool bFromCache
; /* ignore */
/* We calculate these. Some SMs in circulation have bogus values for
- * these, so make sure we always calculate it ourself. */
+ * these, so make sure we always calculate it ourself. */
else if( sValueName=="FIRSTBEAT" )
{
if( bFromCache )
diff --git a/src/NotesLoaderSSC.cpp b/src/NotesLoaderSSC.cpp
index 1b9c7033de..a2308e9fd2 100644
--- a/src/NotesLoaderSSC.cpp
+++ b/src/NotesLoaderSSC.cpp
@@ -11,6 +11,7 @@
#include "Song.h"
#include "SongManager.h"
#include "Steps.h"
+#include "Attack.h"
#include "PrefsManager.h"
/**
@@ -519,6 +520,35 @@ bool SSCLoader::LoadFromSSCFile( const RString &sPath, Song &out, bool bFromCach
}
}
}
+
+ else if( sValueName=="LABELS" )
+ {
+ vector arrayLabelExpressions;
+ split( sParams[1], ",", arrayLabelExpressions );
+
+ for( unsigned b=0; b arrayLabelValues;
+ split( arrayLabelExpressions[b], "=", arrayLabelValues );
+ if( arrayLabelValues.size() != 2 )
+ {
+ LOG->UserLog( "Song file", "(UNKNOWN)", "has an invalid #%s value \"%s\" (must have exactly one '='), ignored.",
+ sValueName.c_str(), arrayLabelExpressions[b].c_str() );
+ continue;
+ }
+
+ const float fBeat = StringToFloat( arrayLabelValues[0] );
+ RString sLabel = arrayLabelValues[1];
+ TrimRight(sLabel);
+ if( fBeat >= 0.0f )
+ out.m_Timing.AddLabelSegment( LabelSegment(fBeat, sLabel) );
+ else
+ {
+ LOG->UserLog( "Song file", "(UNKNOWN)", "has an invalid Label at beat %f called %s.", fBeat, sLabel.c_str() );
+ }
+
+ }
+ }
else if( sValueName=="TIMESIGNATURES" )
{
@@ -768,180 +798,28 @@ bool SSCLoader::LoadFromSSCFile( const RString &sPath, Song &out, bool bFromCach
{
if( sValueName=="STOPS" )
{
- /*
- vector arrayFreezeExpressions;
- split( sParams[1], ",", arrayFreezeExpressions );
-
- for( unsigned f=0; f arrayFreezeValues;
- split( arrayFreezeExpressions[f], "=", arrayFreezeValues );
- if( arrayFreezeValues.size() != 2 )
- {
- // XXX: Hard to tell which file caused this.
- LOG->UserLog( "Song file", "(UNKNOWN)", "has an invalid #%s value \"%s\" (must have exactly one '='), ignored.",
- sValueName.c_str(), arrayFreezeExpressions[f].c_str() );
- continue;
- }
-
- const float fFreezeBeat = StringToFloat( arrayFreezeValues[0] );
- const float fFreezeSeconds = StringToFloat( arrayFreezeValues[1] );
- StopSegment new_seg( BeatToNoteRow(fFreezeBeat), fFreezeSeconds );
-
- if(fFreezeSeconds > 0.0f)
- {
- // LOG->Trace( "Adding a freeze segment: beat: %f, seconds = %f", new_seg.m_fStartBeat, new_seg.m_fStopSeconds );
- pNewNotes->m_Timing.AddStopSegment( new_seg );
- }
- else
- {
- // negative stops (hi JS!) -aj
- if( PREFSMAN->m_bQuirksMode )
- {
- // LOG->Trace( "Adding a negative freeze segment: beat: %f, seconds = %f", new_seg.m_fStartBeat, new_seg.m_fStopSeconds );
- pNewNotes->m_Timing.AddStopSegment( new_seg );
- }
- else
- LOG->UserLog( "Song file", "(UNKNOWN)", "has an invalid stop at beat %f, length %f.", fFreezeBeat, fFreezeSeconds );
- }
- }
- */
+ // copy from above when it's time.
}
else if( sValueName=="DELAYS" )
{
- /*
- vector arrayDelayExpressions;
- split( sParams[1], ",", arrayDelayExpressions );
-
- for( unsigned f=0; f arrayDelayValues;
- split( arrayDelayExpressions[f], "=", arrayDelayValues );
- if( arrayDelayValues.size() != 2 )
- {
- // XXX: Hard to tell which file caused this.
- LOG->UserLog( "Song file", "(UNKNOWN)", "has an invalid #%s value \"%s\" (must have exactly one '='), ignored.",
- sValueName.c_str(), arrayDelayExpressions[f].c_str() );
- continue;
- }
-
- const float fFreezeBeat = StringToFloat( arrayDelayValues[0] );
- const float fFreezeSeconds = StringToFloat( arrayDelayValues[1] );
-
- StopSegment new_seg( BeatToNoteRow(fFreezeBeat), fFreezeSeconds, true );
-
- // LOG->Trace( "Adding a delay segment: beat: %f, seconds = %f", new_seg.m_fStartBeat, new_seg.m_fStopSeconds );
-
- if(fFreezeSeconds > 0.0f)
- pNewNotes->m_Timing.AddStopSegment( new_seg );
- else
- LOG->UserLog( "Song file", "(UNKNOWN)", "has an invalid delay at beat %f, length %f.", fFreezeBeat, fFreezeSeconds );
- }
- */
+ // copy from above when it's time.
}
else if( sValueName=="TIMESIGNATURES" )
{
- /*
- vector vs1;
- split( sParams[1], ",", vs1 );
-
- FOREACH_CONST( RString, vs1, s1 )
- {
- vector vs2;
- split( *s1, "=", vs2 );
-
- if( vs2.size() < 3 )
- {
- LOG->UserLog( "Song file", "(UNKNOWN)", "has an invalid time signature change with %i values.", (int)vs2.size() );
- continue;
- }
-
- const float fBeat = StringToFloat( vs2[0] );
-
- TimeSignatureSegment seg;
- seg.m_iStartRow = BeatToNoteRow(fBeat);
- seg.m_iNumerator = atoi( vs2[1] );
- seg.m_iDenominator = atoi( vs2[2] );
-
- if( fBeat < 0 )
- {
- LOG->UserLog( "Song file", "(UNKNOWN)", "has an invalid time signature change with beat %f.", fBeat );
- continue;
- }
-
- if( seg.m_iNumerator < 1 )
- {
- LOG->UserLog( "Song file", "(UNKNOWN)", "has an invalid time signature change with beat %f, iNumerator %i.", fBeat, seg.m_iNumerator );
- continue;
- }
-
- if( seg.m_iDenominator < 1 )
- {
- LOG->UserLog( "Song file", "(UNKNOWN)", "has an invalid time signature change with beat %f, iDenominator %i.", fBeat, seg.m_iDenominator );
- continue;
- }
-
- pNewNotes->m_Timing.AddTimeSignatureSegment( seg );
- }
- */
+ // copy from above when it's time.
}
else if( sValueName=="TICKCOUNTS" )
{
- /*
- vector arrayTickcountExpressions;
- split( sParams[1], ",", arrayTickcountExpressions );
-
- for( unsigned f=0; f arrayTickcountValues;
- split( arrayTickcountExpressions[f], "=", arrayTickcountValues );
- if( arrayTickcountValues.size() != 2 )
- {
- // XXX: Hard to tell which file caused this.
- LOG->UserLog( "Song file", "(UNKNOWN)", "has an invalid #%s value \"%s\" (must have exactly one '='), ignored.",
- sValueName.c_str(), arrayTickcountExpressions[f].c_str() );
- continue;
- }
-
- const float fTickcountBeat = StringToFloat( arrayTickcountValues[0] );
- const int iTicks = atoi( arrayTickcountValues[1] );
- TickcountSegment new_seg( BeatToNoteRow(fTickcountBeat), iTicks );
-
- if(iTicks >= 1 && iTicks <= ROWS_PER_BEAT ) // Constants
- {
- // LOG->Trace( "Adding a tickcount segment: beat: %f, ticks = %d", fTickcountBeat, iTicks );
- pNewNotes->m_Timing.AddTickcountSegment( new_seg );
- }
- else
- {
- LOG->UserLog( "Song file", "(UNKNOWN)", "has an invalid tickcount at beat %f, ticks %d.", fTickcountBeat, iTicks );
- }
- }
- */
+ // copy from above when it's time.
}
else if( sValueName=="COMBOS" )
{
- /*
- vector arrayComboExpressions;
- split( sParams[1], ",", arrayComboExpressions );
-
- for( unsigned f=0; f arrayComboValues;
- split( arrayComboExpressions[f], "=", arrayComboValues );
- if( arrayComboValues.size() != 2 )
- {
- LOG->UserLog( "Song file", "(UNKNOWN)", "has an invalid #%s value \"%s\" (must have exactly one '='), ignored.",
- sValueName.c_str(), arrayComboExpressions[f].c_str() );
- continue;
- }
- const float fComboBeat = StringToFloat( arrayComboValues[0] );
- const int iCombos = atoi( arrayComboValues[1] );
- ComboSegment new_seg( BeatToNoteRow( fComboBeat ), iCombos );
- pNewNotes->m_Timing.AddComboSegment( new_seg );
- }
- */
+ // copy from above when it's time.
+ }
+ else if( sValueName=="WARPS" || sValueName=="LABELS" )
+ {
+ // copy from above when it's time.
}
else if( sValueName=="ATTACKS" )
{
diff --git a/src/NotesWriterSM.cpp b/src/NotesWriterSM.cpp
index 23f9a646ce..95d14e75fb 100644
--- a/src/NotesWriterSM.cpp
+++ b/src/NotesWriterSM.cpp
@@ -134,6 +134,19 @@ static void WriteGlobalTags( RageFile &f, const Song &out )
}
}
f.PutLine( ";" );
+
+ f.Write( "#ATTACKS:" );
+ for( unsigned j = 0; j < out.m_Attacks.size(); j++ )
+ {
+ const Attack &a = out.m_Attacks[j];
+ f.Write( ssprintf( "TIME=%.2f:LEN=%.2f:MODS=%s",
+ a.fStartSecond, a.fSecsRemaining, a.sModifiers.c_str() ) );
+
+ if( j+1 < out.m_Attacks.size() )
+ f.Write( ":" );
+ f.PutLine( "" );
+ }
+ f.PutLine( ";" );
f.Write( "#DELAYS:" );
for( unsigned i=0; i asBPMValues;
- for( unsigned i=0; i asStopValues;
- for( unsigned i=0; i asDelayValues;
- for( unsigned i=0; i asWarpValues;
- for( unsigned i=0; i asTimeSigValues;
- FOREACH_CONST( TimeSignatureSegment, in.m_Timing.m_vTimeSignatureSegments, iter )
- {
- asTimeSigValues.push_back( ssprintf( "%.6f=%d=%d", NoteRowToBeat(iter->m_iStartRow), iter->m_iNumerator, iter->m_iDenominator ) );
- vector::const_iterator iter2 = iter;
- iter2++;
- }
- lines.push_back( ssprintf( "#TIMESIGNATURES:%s;", join("\n,", asTimeSigValues).c_str() ) );
-
- ASSERT( !in.m_Timing.m_TickcountSegments.empty() );
- vector asTickValues;
- for( unsigned i=0; i asComboValues;
- for( unsigned i=0; i g_bEnableMineSoundPlayback ( "EnableMineHitSound", true
Preference g_fTimingWindowHopo ( "TimingWindowHopo", 0.25 ); // max time between notes in a hopo chain
Preference g_fTimingWindowStrum ( "TimingWindowStrum", 0.1f ); // max time between strum and when the frets must match
+/** @brief How much life is in a hold note when you start on it? */
ThemeMetric INITIAL_HOLD_LIFE ( "Player", "InitialHoldLife" );
-ThemeMetric MAX_HOLD_LIFE ( "Player", "MaxHoldLife" ); // sm-ssc addition
+/**
+ * @brief How much hold life is possible to have when holding a hold note?
+ *
+ * This was an sm-ssc addition. */
+ThemeMetric MAX_HOLD_LIFE ( "Player", "MaxHoldLife" );
ThemeMetric PENALIZE_TAP_SCORE_NONE ( "Player", "PenalizeTapScoreNone" );
ThemeMetric JUDGE_HOLD_NOTES_ON_SAME_ROW_TOGETHER ( "Player", "JudgeHoldNotesOnSameRowTogether" );
/**
@@ -174,6 +179,11 @@ ThemeMetric REQUIRE_STEP_ON_MINES ( "Player", "RequireStepOnMines" );
*
* For those wishing to make a theme very accurate to In The Groove 2, set this to false. */
ThemeMetric ROLL_BODY_INCREMENTS_COMBO ( "Player", "RollBodyIncrementsCombo" );
+/**
+ * @brief Are checkpoints and taps considered separate judgments?
+ *
+ * If set to true, they are considered separate.
+ * If set to false, they are considered the same. */
ThemeMetric CHECKPOINTS_TAPS_SEPARATE_JUDGMENT ( "Player", "CheckpointsTapsSeparateJudgment" );
/**
* @brief Do we score missed holds and rolls with HoldNoteScores?
@@ -1318,9 +1328,9 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vectorTrace("tap note scoring time.");
TapNote &tn = *vTN[0].pTN;
+ SetHoldJudgment( tn.result.tns, tn.HoldResult.hns, iFirstTrackWithMaxEndRow );
HandleHoldScore( tn );
//LOG->Trace("hold result = %s",StringConversion::ToString(tn.HoldResult.hns).c_str());
- SetHoldJudgment( tn.result.tns, tn.HoldResult.hns, iFirstTrackWithMaxEndRow );
}
//LOG->Trace("[Player::UpdateHoldNotes] ends");
}
@@ -1803,8 +1813,8 @@ void Player::ScoreAllActiveHoldsLetGo()
tn.HoldResult.hns = HNS_LetGo;
tn.HoldResult.fLife = 0;
- HandleHoldScore( tn );
SetHoldJudgment( tn.result.tns, tn.HoldResult.hns, iTrack );
+ HandleHoldScore( tn );
}
}
}
diff --git a/src/PlayerStageStats.cpp b/src/PlayerStageStats.cpp
index cbeddfa243..6aab543b26 100644
--- a/src/PlayerStageStats.cpp
+++ b/src/PlayerStageStats.cpp
@@ -234,7 +234,7 @@ float PlayerStageStats::MakePercentScore( int iActual, int iPossible )
int iPercentTotalDigits = 3 + CommonMetrics::PERCENT_SCORE_DECIMAL_PLACES; // "100" + "." + "00"
- // TRICKY: printf will round, but we want to truncate. therwise, we may display
+ // TRICKY: printf will round, but we want to truncate. Otherwise, we may display
// a percent score that's too high and doesn't match up with the calculated grade.
float fTruncInterval = powf( 0.1f, (float)iPercentTotalDigits-1 );
@@ -250,7 +250,9 @@ RString PlayerStageStats::FormatPercentScore( float fPercentDancePoints )
{
int iPercentTotalDigits = 3 + CommonMetrics::PERCENT_SCORE_DECIMAL_PLACES; // "100" + "." + "00"
- RString s = ssprintf( "%*.*f%%", iPercentTotalDigits, (int)CommonMetrics::PERCENT_SCORE_DECIMAL_PLACES, fPercentDancePoints*100 );
+ RString s = ssprintf( "%*.*f%%", iPercentTotalDigits,
+ (int)CommonMetrics::PERCENT_SCORE_DECIMAL_PLACES,
+ fPercentDancePoints*100 );
return s;
}
@@ -679,6 +681,7 @@ public:
DEFINE_METHOD( GetCurrentMissCombo, m_iCurMissCombo )
DEFINE_METHOD( GetCurrentScoreMultiplier, m_iCurScoreMultiplier )
DEFINE_METHOD( GetScore, m_iScore )
+ DEFINE_METHOD( GetCurMaxScore, m_iCurMaxScore )
DEFINE_METHOD( GetTapNoteScores, m_iTapNoteScores[Enum::Check(L, 1)] )
DEFINE_METHOD( GetHoldNoteScores, m_iHoldNoteScores[Enum::Check(L, 1)] )
DEFINE_METHOD( FullCombo, FullCombo() )
@@ -724,7 +727,24 @@ public:
static int GetRadarPossible( T* p, lua_State *L ) { p->m_radarPossible.PushSelf(L); return 1; }
static int GetRadarActual( T* p, lua_State *L ) { p->m_radarActual.PushSelf(L); return 1; }
- static int SetScore( T* p, lua_State *L ) { if( IArg(1) >= 0 ){ p->m_iScore = IArg(1); return 1; } return 0; }
+ static int SetScore( T* p, lua_State *L )
+ {
+ if( IArg(1) >= 0 )
+ {
+ p->m_iScore = IArg(1);
+ return 1;
+ }
+ return 0;
+ }
+ static int SetCurMaxScore( T* p, lua_State *L )
+ {
+ if( IArg(1) >= 0 )
+ {
+ p->m_iCurMaxScore = IArg(1);
+ return 1;
+ }
+ return 0;
+ }
LunaPlayerStageStats()
{
@@ -735,6 +755,7 @@ public:
ADD_METHOD( GetCurrentMissCombo );
ADD_METHOD( GetCurrentScoreMultiplier );
ADD_METHOD( GetScore );
+ ADD_METHOD( GetCurMaxScore );
ADD_METHOD( GetTapNoteScores );
ADD_METHOD( GetHoldNoteScores );
ADD_METHOD( FullCombo );
@@ -761,6 +782,7 @@ public:
ADD_METHOD( GetRadarPossible );
ADD_METHOD( GetBestFullComboTapNoteScore );
ADD_METHOD( SetScore );
+ ADD_METHOD( SetCurMaxScore );
}
};
diff --git a/src/PlayerStageStats.h b/src/PlayerStageStats.h
index 3ca79504ab..5c6a944c5c 100644
--- a/src/PlayerStageStats.h
+++ b/src/PlayerStageStats.h
@@ -12,9 +12,13 @@ struct lua_State;
class PlayerStageStats
{
public:
+ /** @brief Set up the PlayerStageStats with default values. */
PlayerStageStats() { Init(); }
void Init();
+ /**
+ * @brief Add stats from one PlayerStageStats to another.
+ * @param other the other stats to add to this one. */
void AddStats( const PlayerStageStats& other ); // accumulate
Grade GetGrade() const;
@@ -51,14 +55,25 @@ public:
int m_iPossibleGradePoints;
int m_iTapNoteScores[NUM_TapNoteScore];
int m_iHoldNoteScores[NUM_HoldNoteScore];
+ /** @brief The Player's current combo. */
int m_iCurCombo;
+ /** @brief The Player's max combo. */
int m_iMaxCombo;
+ /** @brief The Player's current miss combo. */
int m_iCurMissCombo;
int m_iCurScoreMultiplier;
+ /** @brief The player's current score. */
int m_iScore;
+ /** @brief The theoretically highest score the Player could have at this point. */
int m_iCurMaxScore;
+ /** @brief The maximum score the Player can get this goaround. */
int m_iMaxScore;
- RadarValues m_radarPossible; // filled in by ScreenGameplay on start of notes
+
+ /**
+ * @brief The possible RadarValues for a song.
+ *
+ * This is filled in by ScreenGameplay on the start of the notes. */
+ RadarValues m_radarPossible;
RadarValues m_radarActual;
/** @brief How many songs were passed by the Player? */
int m_iSongsPassed;
@@ -83,18 +98,30 @@ public:
struct Combo_t
{
- /* Start and size of this combo, in the same scale as the combo list
- * mapping and the life record. */
- float m_fStartSecond, m_fSizeSeconds;
+ /**
+ * @brief The start time of the combo.
+ *
+ * This uses the same scale as the combo list mapping. */
+ float m_fStartSecond;
+ /**
+ * @brief The size time of the combo.
+ *
+ * This uses the same scale as the life record. */
+ float m_fSizeSeconds;
- // Combo size, in steps.
+ /** @brief The size of the Combo, in steps. */
int m_cnt;
- /* Size of the combo that didn't come from this stage (rollover from the
- * last song). (This is a subset of cnt.) */
+ /**
+ * @brief The size of the combo that didn't come from this stage.
+ *
+ * This is generally rolled over from the last song.
+ * It is also a subset of m_cnt. */
int m_rollover;
- // Get the size of the combo that came from this song.
+ /**
+ * @brief Retrieve the size of the combo that came from this song.
+ * @return this song's combo size. */
int GetStageCnt() const { return m_cnt - m_rollover; }
Combo_t(): m_fStartSecond(0), m_fSizeSeconds(0), m_cnt(0), m_rollover(0) { }
diff --git a/src/PrefsManager.cpp b/src/PrefsManager.cpp
index 3a3a35fa1f..87ec4d8b7f 100644
--- a/src/PrefsManager.cpp
+++ b/src/PrefsManager.cpp
@@ -125,15 +125,6 @@ XToString( CourseSortOrders );
StringToX( CourseSortOrders );
LuaXType( CourseSortOrders );
-static const char *ScoringTypeNames[] = {
- "New",
- "Old",
- "Custom",
-};
-XToString( ScoringType );
-StringToX( ScoringType );
-LuaXType( ScoringType );
-
// XXX: Fix fail bug?
/* static const char *DefaultFailTypeNames[] = {
"Immediate",
@@ -263,7 +254,6 @@ PrefsManager::PrefsManager() :
m_CourseSortOrder ( "CourseSortOrder", COURSE_SORT_SONGS ),
m_bSubSortByNumSteps ( "SubSortByNumSteps", false ),
m_GetRankingName ( "GetRankingName", RANKING_ON ),
- m_ScoringType ( "ScoringType", SCORING_NEW ),
m_sAdditionalSongFolders ( "AdditionalSongFolders", "" ),
m_sAdditionalCourseFolders ( "AdditionalCourseFolders", "" ),
m_sAdditionalFolders ( "AdditionalFolders", "" ),
diff --git a/src/PrefsManager.h b/src/PrefsManager.h
index 332da7da08..2d1f564bb3 100644
--- a/src/PrefsManager.h
+++ b/src/PrefsManager.h
@@ -108,14 +108,6 @@ enum CourseSortOrders
NUM_CourseSortOrders,
CourseSortOrders_Invalid
};
-enum ScoringType
-{
- SCORING_NEW,
- SCORING_OLD,
- SCORING_CUSTOM,
- NUM_ScoringType,
- ScoringType_Invalid
-};
enum DefaultFailType
{
@@ -266,8 +258,6 @@ public:
Preference m_bSubSortByNumSteps;
Preference m_GetRankingName;
- Preference m_ScoringType;
-
Preference m_sAdditionalSongFolders;
Preference m_sAdditionalCourseFolders;
Preference m_sAdditionalFolders;
diff --git a/src/RageFileDriverDeflate.cpp b/src/RageFileDriverDeflate.cpp
index dbb839c1ab..6906a6eb5b 100644
--- a/src/RageFileDriverDeflate.cpp
+++ b/src/RageFileDriverDeflate.cpp
@@ -7,9 +7,9 @@
#include
#if defined(_WINDOWS)
- #include "zlib/zlib.h"
+ #include "../extern/zlib/zlib.h"
#if defined(_MSC_VER)
- #pragma comment(lib, "zlib/zdll.lib")
+ #pragma comment(lib, "../extern/zlib/zdll.lib")
#endif
#elif defined(MACOSX)
/* Since crypto++ was added to the repository, includes the zlib.h
diff --git a/src/RageSoundReader_MP3.cpp b/src/RageSoundReader_MP3.cpp
index b1219ea1e7..c23bda8a9e 100644
--- a/src/RageSoundReader_MP3.cpp
+++ b/src/RageSoundReader_MP3.cpp
@@ -10,9 +10,9 @@
#include