From 43f036508b8e9fe98580157b96ac65661dbfacca Mon Sep 17 00:00:00 2001 From: ihatecompvir Date: Sun, 29 Sep 2024 04:25:22 -0700 Subject: [PATCH] Fix NetLog linking error Uncook the build Once again fix --- config/SZBE69_B8/objects.json | 2 +- src/band3/bandtrack/TrackConfig.cpp | 6 +-- src/band3/game/BandUser.cpp | 2 +- src/band3/game/Defines.cpp | 79 +++++------------------------ src/band3/game/Defines.h | 30 ++++------- src/network/net/NetLog.cpp | 4 +- src/network/net/NetLog.h | 3 ++ 7 files changed, 34 insertions(+), 92 deletions(-) create mode 100644 src/network/net/NetLog.h diff --git a/config/SZBE69_B8/objects.json b/config/SZBE69_B8/objects.json index 75bb6b3d..d49ba2dc 100644 --- a/config/SZBE69_B8/objects.json +++ b/config/SZBE69_B8/objects.json @@ -539,7 +539,7 @@ "network/Plugins/ConnectionManager.cpp": "MISSING", "network/Plugins/ConnectionOrientedStream.cpp": "MISSING", "network/Plugins/ConnectivityManager.cpp": "MISSING", - "network/Plugins/EmulationDevice.cpp": "Matching", + "network/Plugins/EmulationDevice.cpp": "NonMatching", "network/Plugins/EncryptionAlgorithm.cpp": "MISSING", "network/Plugins/EndPoint.cpp": "MISSING", "network/Plugins/HighLevelStream.cpp": "MISSING", diff --git a/src/band3/bandtrack/TrackConfig.cpp b/src/band3/bandtrack/TrackConfig.cpp index fc756572..94f5668f 100644 --- a/src/band3/bandtrack/TrackConfig.cpp +++ b/src/band3/bandtrack/TrackConfig.cpp @@ -25,11 +25,11 @@ bool TrackConfig::GetDisableHopos() const { return mDisableHopos; } bool TrackConfig::UseLeftyGems() const { return mLefty; } bool TrackConfig::IsDrumTrack() const { return mUser->GetTrackType() == kTrackDrum; } -bool TrackConfig::IsKeyboardTrack() const { return mUser->GetTrackType() == kTrackKeys; } +bool TrackConfig::IsKeyboardTrack() const { return mUser->GetTrackType() == kTrackKeyboard; } bool TrackConfig::AllowsOverlappingGems() const { bool b = 0; - if (mUser->GetTrackType() == kTrackKeys || mUser->GetTrackType() == 4) b = true; + if (mUser->GetTrackType() == kTrackKeyboard || mUser->GetTrackType() == 4) b = true; return b; } @@ -38,7 +38,7 @@ bool TrackConfig::AllowsPartialHits() const { return mUser->GetControllerType() bool TrackConfig::IsRealGuitarTrack() const { TrackType t = mUser->GetTrackType(); bool b = 0; - if (t == kTrackRealGuitar || t == kTrackRealBass) b = true; + if (t == kTrackProGuitar || t == kTrackProBass) b = true; return b; } diff --git a/src/band3/game/BandUser.cpp b/src/band3/game/BandUser.cpp index 0c2fd1bb..1404dfcb 100644 --- a/src/band3/game/BandUser.cpp +++ b/src/band3/game/BandUser.cpp @@ -3,7 +3,7 @@ #include "utl/Symbols.h" BandUser::BandUser() - : mDifficulty(DefaultDifficulty()), unk_0xC(0), mTrackType(kTrackNone), + : mDifficulty(DefaultDifficulty()), unk_0xC(0), mTrackType(kTrackDrum), mControllerType(kControllerNone), unk_0x18(0), unk_0x19(0), unk_0x1C(10), unk_0x20(5), mChar(0), mAutoplay(0), mLastHitFraction(0), mTrack(0), mPlayer(0), mParticipating(0), mIsWiiRemoteController(0), mJustDisconnected(0) { diff --git a/src/band3/game/Defines.cpp b/src/band3/game/Defines.cpp index a2f8b8f6..76238c46 100644 --- a/src/band3/game/Defines.cpp +++ b/src/band3/game/Defines.cpp @@ -1,83 +1,30 @@ #include "Defines.h" -#include -#include - -TrackType ControllerTypeToTrackType(ControllerType controllerType, bool alt) { - switch (controllerType) { - case kControllerDrum: - return kTrackDrum; - case kControllerVocals: - return kTrackVocals; - case kControllerGuitar: - return alt ? kTrackBass : kTrackGuitar; - case kControllerRealGuitar: - return alt ? kTrackRealBass : kTrackRealGuitar; - case kControllerKeys: - return alt ? kTrackRealKeys : kTrackKeys; - default: - return kTrackNone; - } -} TrackType ScoreTypeToTrackType(ScoreType scoreType) { TrackType trackType; switch (scoreType) { - case kScoreDrum: - trackType = kTrackDrum; - break; - case kScoreBass: - trackType = kTrackBass; - break; - case kScoreGuitar: - trackType = kTrackGuitar; - break; - case kScoreVocals: - trackType = kTrackVocals; - break; - case kScoreHarmony: - trackType = kTrackVocals; - break; - case kScoreKeys: - trackType = kTrackKeys; + case 0: break; - case kScoreRealDrum: - trackType = kTrackDrum; - break; - case kScoreRealGuitar: - trackType = kTrackRealGuitar; - break; - case kScoreRealBass: - trackType = kTrackRealBass; - break; - case kScoreRealKeys: - trackType = kTrackRealKeys; - break; - case kScoreBand: - trackType = kTrackNone; - break; - default: - TheDebug.Fail(MakeString("no TrackType for this ScoreType!")); - trackType = kTrackNone; } return trackType; } ControllerType TrackTypeToControllerType(TrackType trackType) { switch (trackType) { - case kTrackDrum: + case 0: return kControllerDrum; - case kTrackGuitar: - case kTrackBass: + case 1: + case 2: return kControllerGuitar; - case kTrackVocals: + case 3: return kControllerVocals; - case kTrackKeys: - case kTrackRealKeys: - return kControllerKeys; - case kTrackRealGuitar: - case kTrackRealBass: - return kControllerRealGuitar; - default: + case 4: + case 5: return kControllerNone; + case 6: + case 8: + return (ControllerType)4; + default: + return (ControllerType)5; } -} +} \ No newline at end of file diff --git a/src/band3/game/Defines.h b/src/band3/game/Defines.h index aede1f31..e9eecc8e 100644 --- a/src/band3/game/Defines.h +++ b/src/band3/game/Defines.h @@ -17,10 +17,8 @@ enum ControllerType { kControllerDrum = 0, kControllerGuitar = 1, kControllerVocals = 2, - kControllerKeys = 3, - kControllerRealGuitar = 4, - kControllerNone = 5, - kNumControllerTypes = 5 + kControllerNone = 3, + kNumControllerTypes = 3, }; enum ScoreType { @@ -40,23 +38,17 @@ enum ScoreType { }; enum TrackType { - kTrackDrum, - kTrackGuitar, - kTrackBass, - kTrackVocals, - kTrackKeys, - kTrackRealKeys, - kTrackRealGuitar, - kTrackRealGuitar22Fret, - kTrackRealBass, - kTrackRealBass22Fret, - kTrackNone, - kNumTrackTypes, - kTrackPending, - kTrackPendingVocals + kTrackDrum = 0, + kTrackGuitar = 1, // guess + kTrackBass = 2, // guess + + kTrack4 = 4, + kTrackKeyboard = 5, + kTrackProGuitar = 6, + + kTrackProBass = 8 }; -TrackType ControllerTypeToTrackType(ControllerType controllerType, bool isReal); TrackType ScoreTypeToTrackType(ScoreType scoreType); ControllerType TrackTypeToControllerType(TrackType trackType); Symbol TrackTypeToSym(TrackType); diff --git a/src/network/net/NetLog.cpp b/src/network/net/NetLog.cpp index 73f160d4..6506a8ef 100644 --- a/src/network/net/NetLog.cpp +++ b/src/network/net/NetLog.cpp @@ -1,3 +1,3 @@ -#include "system/utl/LogFile.h" +#include "NetLog.h" -static LogFile NetLog = LogFile("netlog-%05d.txt"); \ No newline at end of file +LogFile NetLog = LogFile("netlog-%05d.txt"); \ No newline at end of file diff --git a/src/network/net/NetLog.h b/src/network/net/NetLog.h new file mode 100644 index 00000000..d96ac536 --- /dev/null +++ b/src/network/net/NetLog.h @@ -0,0 +1,3 @@ +#include "system/utl/LogFile.h" + +extern LogFile NetLog; \ No newline at end of file