From af1abe9e7412d452d1dd3aabb317a6fd9323f2a1 Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Wed, 10 May 2023 01:32:55 -0700 Subject: [PATCH] Use only ints --- dGame/LeaderboardManager.cpp | 8 ++++---- dScripts/ActivityManager.cpp | 2 +- dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dGame/LeaderboardManager.cpp b/dGame/LeaderboardManager.cpp index 0c89030e..4b236384 100644 --- a/dGame/LeaderboardManager.cpp +++ b/dGame/LeaderboardManager.cpp @@ -182,7 +182,7 @@ std::string Leaderboard::GetInsertFormat(Leaderboard::Type leaderboardType) { std::string columns; switch (leaderboardType) { case Type::ShootingGallery: - columns = "score=%i, hitPercentage=%f, streak=%i"; + columns = "score=%i, hitPercentage=%i, streak=%i"; break; case Type::Racing: columns = "bestLapTime=%i, bestTime=%i, numWins=numWins + %i"; @@ -407,9 +407,9 @@ void LeaderboardManager::SaveScore(const LWOOBJID& playerID, GameID gameID, Lead int32_t score; score = va_arg(argsCopy, int32_t); - float oldHitPercentage = myScoreResult->getFloat("hitPercentage"); - float hitPercentage; - hitPercentage = va_arg(argsCopy, double); + int32_t oldHitPercentage = myScoreResult->getFloat("hitPercentage"); + int32_t hitPercentage; + hitPercentage = va_arg(argsCopy, int32_t); int32_t oldStreak = myScoreResult->getInt("streak"); int32_t streak; diff --git a/dScripts/ActivityManager.cpp b/dScripts/ActivityManager.cpp index 5b361510..85365e01 100644 --- a/dScripts/ActivityManager.cpp +++ b/dScripts/ActivityManager.cpp @@ -87,7 +87,7 @@ void ActivityManager::SaveScore(Entity* self, LWOOBJID playerID, uint32_t val1, uint32_t gameID = sac != nullptr ? sac->GetActivityID() : self->GetLOT(); // Save the new score to the leaderboard and show the leaderboard to the player auto leaderboardType = LeaderboardManager::GetLeaderboardType(gameID); - Game::logger->Log("ActivityManager", "leaderboard type %i %i", leaderboardType, gameID); + Game::logger->Log("ActivityManager", "leaderboard type %i %i args %i %i %i", leaderboardType, gameID, val1, val2, val3); LeaderboardManager::Instance().SaveScore(playerID, gameID, leaderboardType, 3, val1, val2, val3); // Makes the leaderboard show up for the player diff --git a/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp b/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp index 098d9e55..3d386775 100644 --- a/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp +++ b/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp @@ -546,13 +546,13 @@ void SGCannon::StopGame(Entity* self, bool cancel) { // The player won, store all the score and send rewards if (!cancel) { - auto percentage = 0; + int32_t percentage = 50; auto misses = self->GetVar(MissesVariable); auto fired = self->GetVar(ShotsFiredVariable); - if (fired > 0) { - percentage = misses / fired; - } + // if (fired > 0) { + // percentage = misses / fired; + // } auto* missionComponent = player->GetComponent();