Skip to content

Commit

Permalink
replace some silly warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
Jettford committed Dec 11, 2024
1 parent a0f2aeb commit 92d086c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
2 changes: 2 additions & 0 deletions dCommon/dEnums/dPlatforms.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#define DARKFLAME_PLATFORM_IOS
#elif TARGET_OS_MAC
#define DARKFLAME_PLATFORM_MACOS
#pragma clang diagnostic push // prevent pragma messages being counted as a warning
#pragma clang diagnostic ignored "-W#pragma-messages"
#else
#error unknown Apple operating system
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class AMFArrayValue;
* @brief Sent when a player moves a Behavior A at position B to their inventory.
*/
#pragma message("MoveToInventory.h This Control Behavior Message does not have a test yet. Non-developers can ignore this warning.")

class MoveToInventoryMessage : public BehaviorMessageBase {
public:
MoveToInventoryMessage(const AMFArrayValue& arguments);
Expand Down
2 changes: 1 addition & 1 deletion dGame/dUtilities/Preconditions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ bool Precondition::CheckValue(Entity* player, const uint32_t value, bool evaluat

return inventoryComponent->GetLotCount(value) >= count;
case PreconditionType::DoesNotHaveItem:
return inventoryComponent->IsEquipped(value) < count;
return (inventoryComponent->IsEquipped(value) ? 1 : 0) < count;
case PreconditionType::HasAchievement:
if (missionComponent == nullptr) return false;
return missionComponent->GetMissionState(value) >= eMissionState::COMPLETE;
Expand Down
8 changes: 4 additions & 4 deletions dScripts/02_server/Map/AM/RandomSpawnerFin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ void RandomSpawnerFin::OnStartup(Entity* self) {
};

sectionMultipliers = {
{"secA", 1},
{"secB", 1},
{"secA", 1.0f},
{"secB", 1.0f},
{"secC", 1.2f},
{"secD", 1.3f},
{"secE", 1.6f},
{"secF", 1},
{"secG", 1},
{"secF", 1.0f},
{"secG", 1.0f},
{"secH", 1.2f},
};

Expand Down

0 comments on commit 92d086c

Please sign in to comment.