diff --git a/Source/minicook/OvenCookspot.h b/Source/minicook/OvenCookspot.h index 028b3df..73fcea7 100644 --- a/Source/minicook/OvenCookspot.h +++ b/Source/minicook/OvenCookspot.h @@ -30,7 +30,6 @@ public: void SetCurrentHeat(const double InCurrentHeat) { CurrentHeat = InCurrentHeat; } public: - UPROPERTY(EditAnywhere, BlueprintReadWrite) TObjectPtr FireMesh; @@ -48,6 +47,7 @@ public: UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Default") TObjectPtr FireScaleCurveZ; + private: // [0.0, 1.0] double CurrentHeat{0.0}; diff --git a/Source/minicook/OvenPawn.cpp b/Source/minicook/OvenPawn.cpp index da1c38f..fd02a88 100644 --- a/Source/minicook/OvenPawn.cpp +++ b/Source/minicook/OvenPawn.cpp @@ -3,10 +3,10 @@ #include "OvenPawn.h" -auto FCookstove::Setup(const UDataTable *DataTablePtr, const int32 MealID, +bool FCookstove::Setup(const UDataTable *DataTablePtr, const int32 MealID, const double InUndercookedMultiplier, const double InOvercookedMultiplier, - const double InScoreMultiplier) -> bool + const double InScoreMultiplier) { // Set the current meal id CurrentMealID = MealID; @@ -29,7 +29,7 @@ auto FCookstove::Setup(const UDataTable *DataTablePtr, const int32 MealID, return true; } -auto FCookstove::GetMealFromTable(const UDataTable *DataTablePtr, const int32 MealID) -> FMeal +FMeal FCookstove::GetMealFromTable(const UDataTable *DataTablePtr, const int32 MealID) { if (DataTablePtr == nullptr || MealID < 0) { @@ -42,7 +42,7 @@ auto FCookstove::GetMealFromTable(const UDataTable *DataTablePtr, const int32 Me return *Meal; } -auto FCookstove::SetCookingTime(const FTimespan CookingTimespan) -> void +void FCookstove::SetCookingTime(const FTimespan CookingTimespan) { StartTime = FDateTime::Now(); EndTime = StartTime + CookingTimespan; @@ -74,7 +74,7 @@ void FCookstove::Update(const float DeltaTime, int32 &PlayerScore) } } -auto FCookstove::GetRemainingCookingTime() const -> FTimespan +FTimespan FCookstove::GetRemainingCookingTime() const { const FDateTime Now = FDateTime::Now(); if (Now >= EndTime) @@ -85,12 +85,12 @@ auto FCookstove::GetRemainingCookingTime() const -> FTimespan return (EndTime - Now).GetTotalMilliseconds(); } -auto FCookstove::IsMealDone() const -> bool +bool FCookstove::IsMealDone() const { return GetRemainingCookingTime() == 0.0; } -auto FCookstove::FinishMeal() -> int32 +int32 FCookstove::FinishMeal() { CookingStats.TotalCookedMeals++; CurrentlyCooking = false; @@ -183,7 +183,7 @@ bool AOvenPawn::TrySpawningNewRandomMeal() return bSuccess; } -auto AOvenPawn::RotateNeedleMouse(double MouseDeltaX) -> void +void AOvenPawn::RotateNeedleMouse(double MouseDeltaX) { verifyf(ActiveDialIndex < CookspotDials.Num(), TEXT( @@ -204,7 +204,7 @@ auto AOvenPawn::RotateNeedleMouse(double MouseDeltaX) -> void Dial.DialRatio = (Dial.MouseDeltaX + 1.0f) / 2.0; } -auto AOvenPawn::RotateNeedleController(const FVector2D ThumbstickLocation) -> void +void AOvenPawn::RotateNeedleController(const FVector2D ThumbstickLocation) { verifyf(ActiveDialIndex < CookspotDials.Num(), TEXT( @@ -225,7 +225,7 @@ auto AOvenPawn::RotateNeedleController(const FVector2D ThumbstickLocation) -> vo Dial.DialRatio = (Dial.DialRatioController + 1.0) / 2.0; } -auto AOvenPawn::CycleActiveOvenDial(const bool CycleRight) -> void +void AOvenPawn::CycleActiveOvenDial(const bool CycleRight) { if (CycleRight) { diff --git a/Source/minicook/OvenPawn.h b/Source/minicook/OvenPawn.h index 3fa54f5..6deca56 100644 --- a/Source/minicook/OvenPawn.h +++ b/Source/minicook/OvenPawn.h @@ -75,38 +75,38 @@ struct FCookstove * @brief Given a @param DataTablePtr and a @param MealID, configure the cookstove to start cooking the meal. * @return Returns whether we found a meal with the provided @param MealID and successfully started cooking it. */ - auto Setup(const UDataTable *DataTablePtr, + bool Setup(const UDataTable *DataTablePtr, const int32 MealID, const double InUndercookedMultiplier, const double InOvercookedMultiplier, - const double InScoreMultiplier) -> bool; + const double InScoreMultiplier); - static auto GetMealFromTable(const UDataTable *DataTablePtr, int32 MealID) -> FMeal; + static FMeal GetMealFromTable(const UDataTable *DataTablePtr, int32 MealID); - auto SetCookingTime(const FTimespan CookingTimespan) -> void; + void SetCookingTime(const FTimespan CookingTimespan); /** * @brief Updates the cookstove for this tick, if a meal is cooking, updates the stats for it and if it finishes it calculates the score, etc... * @param DeltaTime Time between N-1 and N-2 frames in milliseconds. * @param PlayerScore Takes in the current player score in case a meal gets finished and the score must be returned. */ - auto Update(const float DeltaTime, int32 &PlayerScore) -> void; + void Update(const float DeltaTime, int32 &PlayerScore); /** * @brief Returns the remaining cooking time. */ - auto GetRemainingCookingTime() const -> FTimespan; + FTimespan GetRemainingCookingTime() const; /** * @brief Check if the currently cooked meal is done cooking. */ - auto IsMealDone() const -> bool; + bool IsMealDone() const; /** * @brief Finishes up cooking the current meal, setting up the necessary stats and state. * @return Returns the calculated score based on the stats of the cooked meal. */ - auto FinishMeal() -> int32; + int32 FinishMeal(); }; @@ -126,7 +126,7 @@ public: virtual void SetupPlayerInputComponent(class UInputComponent *PlayerInputComponent) override; - auto TrySpawningNewRandomMeal() -> bool; + bool TrySpawningNewRandomMeal(); UFUNCTION(BlueprintCallable, Category="Oven Dials|Controlls") void RotateNeedleMouse(double MouseDeltaX);