Review changes refactor 'unsigned int' ==> 'int'

src/rwe/GameNetworkService.cpp

@@ -332,7 +332,7 @@ namespace rwe
         auto firstRelevantCommandIndex = (endpoint.nextCommandToReceive - firstCommandNumber).value;
 
         // if the packet is relevant (contains new information), process it
-        if (firstRelevantCommandIndex < static_cast<int>(message.command_set_size()))
+        if (firstRelevantCommandIndex < message.command_set_size())
         {
             endpoint.lastReceiveTime = receiveTime;
 

src/rwe/RenderService.cpp

@@ -408,7 +408,7 @@ namespace rwe
                     auto timeSinceSpawn = currentTime - projectile.createdAt;
                     auto fullLifetime = projectile.dieOnFrame.value() - projectile.createdAt;
                     auto percentComplete = static_cast<float>(timeSinceSpawn.value) / static_cast<float>(fullLifetime.value);
-                    int frameIndex = static_cast<int>(percentComplete * spriteSeries->sprites.size());
+                    auto frameIndex = static_cast<int>(percentComplete * spriteSeries->sprites.size());
                     assert(frameIndex < spriteSeries->sprites.size());
                     const auto& sprite = *spriteSeries->sprites[frameIndex];
                     auto modelMatrix = Matrix4f::translation(snappedPosition) * conversionMatrix * sprite.getTransform();

src/rwe/cob/CobEnvironment.cpp

@@ -7,12 +7,12 @@ namespace rwe
     {
     }
 
-    int CobEnvironment::getStatic(int id)
+    int CobEnvironment::getStatic(uint32_t id)
     {
         return _statics.at(id);
     }
 
-    void CobEnvironment::setStatic(int id, int value)
+    void CobEnvironment::setStatic(uint32_t id, int value)
     {
         _statics.at(id) = value;
     }
@@ -43,7 +43,7 @@ namespace rwe
         return thread;
     }
 
-    const CobThread* CobEnvironment::createThread(int functionId, const std::vector<int>& params, int signalMask)
+    const CobThread* CobEnvironment::createThread(int functionId, const std::vector<int>& params, unsigned int signalMask)
     {
         const auto& functionInfo = _script->functions.at(functionId);
         auto& thread = threads.emplace_back(std::make_unique<CobThread>(functionInfo.name, signalMask));
@@ -84,7 +84,7 @@ namespace rwe
         }
     }
 
-    void CobEnvironment::sendSignal(int signal)
+    void CobEnvironment::sendSignal(uint32_t signal)
     {
         for (auto it = threads.begin(); it != threads.end();)
         {

src/rwe/cob/CobEnvironment.h

@@ -69,7 +69,7 @@ namespace rwe
          */
         struct SignalStatus
         {
-            int signal;
+            uint32_t signal;
         };
 
         struct PieceCommandStatus
@@ -111,7 +111,7 @@ namespace rwe
             };
             using CommandType = std::variant<Move, Turn, Spin, StopSpin, Show, Hide, EnableShading, DisableShading>;
 
-            int piece;
+            uint32_t piece;
             CommandType command;
         };
 
@@ -273,17 +273,17 @@ namespace rwe
         CobEnvironment& operator=(CobEnvironment&& other) = delete;
 
     public:
-        int getStatic(int id);
+        int getStatic(uint32_t id);
 
-        void setStatic(int id, int value);
+        void setStatic(uint32_t id, int value);
 
         const CobScript* script();
 
         std::optional<CobThread> createNonScheduledThread(const std::string& functionName, const std::vector<int>& params);
 
         CobThread createNonScheduledThread(int functionId, const std::vector<int>& params);
 
-        const CobThread* createThread(int functionId, const std::vector<int>& params, int signalMask);
+        const CobThread* createThread(int functionId, const std::vector<int>& params, uint32_t signalMask);
 
         const CobThread* createThread(int functionId, const std::vector<int>& params);
 
@@ -298,7 +298,7 @@ namespace rwe
          * If the signal is non-zero after being ANDed
          * with the thread's signal mask, the thread is killed.
          */
-        void sendSignal(int signal);
+        void sendSignal(uint32_t signal);
 
         /**
          * Attempts to collect the return value from a thread.

src/rwe/cob/CobExecutionContext.cpp

@@ -714,14 +714,14 @@ namespace rwe
         return CobAngularSpeed(pop());
     }
 
-    int CobExecutionContext::popSignal()
+    uint32_t CobExecutionContext::popSignal()
     {
-        return pop();
+        return static_cast<uint32_t>(pop());
     }
 
-    int CobExecutionContext::popSignalMask()
+    uint32_t CobExecutionContext::popSignalMask()
     {
-        return pop();
+        return static_cast<uint32_t>(pop());
     }
 
     CobValueId CobExecutionContext::popValueId()
@@ -750,7 +750,7 @@ namespace rwe
         }
     }
 
-    int CobExecutionContext::nextInstruction()
+    uint32_t CobExecutionContext::nextInstruction()
     {
         return env->script()->instructions.at(thread->callStack.top().instructionIndex++);
     }

src/rwe/cob/CobExecutionContext.h

@@ -117,12 +117,12 @@ namespace rwe
         CobSpeed popSpeed();
         CobAngle popAngle();
         CobAngularSpeed popAngularSpeed();
-        int popSignal();
-        int popSignalMask();
+        uint32_t popSignal();
+        uint32_t popSignalMask();
         CobValueId popValueId();
         void push(int val);
 
-        int nextInstruction();
+        uint32_t nextInstruction();
         CobAxis nextInstructionAsAxis();
     };
 }

src/rwe/cob/CobThread.cpp

@@ -2,7 +2,7 @@
 
 namespace rwe
 {
-    CobThread::CobThread(const std::string& name, int signalMask) : name(name), signalMask(signalMask)
+    CobThread::CobThread(const std::string& name, uint32_t signalMask) : name(name), signalMask(signalMask)
     {
     }
 

src/rwe/cob/CobThread.h

@@ -14,7 +14,7 @@ namespace rwe
 
         std::stack<int> stack;
 
-        int signalMask{0};
+        uint32_t signalMask{0};
 
         std::stack<CobFunction> callStack;
 
@@ -27,7 +27,7 @@ namespace rwe
         std::vector<int> returnLocals;
 
     public:
-        CobThread(const std::string& name, int signalMask);
+        CobThread(const std::string& name, uint32_t signalMask);
 
         explicit CobThread(const std::string& name);
     };

src/rwe/grid/DiscreteRect.h

@@ -19,6 +19,7 @@ namespace rwe
         DiscreteRect() = default;
         DiscreteRect(int x, int y, int width, int height) : x(x), y(y), width(width), height(height)
         {
+            assert(width >= 0 && height >= 0);
         }
 
         bool operator==(const DiscreteRect& rhs) const

src/rwe/grid/Grid.h

@@ -17,6 +17,7 @@ namespace rwe
         GridCoordinates() = default;
         GridCoordinates(int x, int y) : x(x), y(y)
         {
+            assert(x >= 0 && y >= 0);
         }
 
         bool operator==(const GridCoordinates& rhs) const
@@ -47,7 +48,10 @@ namespace rwe
         GridRegion() = default;
 
         GridRegion(int x, int y, int width, int height)
-            : x(x), y(y), width(width), height(height) {}
+            : x(x), y(y), width(width), height(height) 
+        { 
+            assert(x >= 0 && y >= 0 && width >= 0 && height >= 0); 
+        }
 
         template <typename Func>
         void forEach(Func f) const
@@ -118,14 +122,15 @@ namespace rwe
         Grid() : width(0), height(0) {}
 
         Grid(int width, int height)
-            : width(width), height(height), data(width * height) {}
+            : width(width), height(height), data(width * height) { assert(width >= 0 && height >= 0); }
 
         Grid(int width, int height, const T& initialValue)
-            : width(width), height(height), data(width * height, initialValue) {}
+            : width(width), height(height), data(width * height, initialValue) { assert(width >= 0 && height >= 0); }
 
         Grid(int width, int height, std::vector<T>&& data)
             : width(width), height(height), data(std::move(data))
         {
+            assert(width >= 0 && height >= 0);
             assert(this->data.size() == width * height);
         }
 

src/rwe/ui/UiFactory.cpp

@@ -613,10 +613,10 @@ namespace rwe
         auto defaultSprite = textureService->getDefaultSprite();
 
         const auto& sprites = (*graphics)->sprites;
-        int spriteCount = static_cast<int>(sprites.size());
+        auto spriteCount = static_cast<int>(sprites.size());
 
         auto stagesPresentCount = spriteCount > 2 ? spriteCount - 2 : 0;
-        int stagesToCopyCount = std::min<int>(stages, stagesPresentCount);//TODO (kwh) - do 
+        auto stagesToCopyCount = std::min<int>(stages, stagesPresentCount);//TODO (kwh) - do 
 
         std::vector<std::shared_ptr<Sprite>> normalSprites;
         for (int i = 0; i < stagesToCopyCount; ++i)

src/rwe/ui/UiListBox.cpp

@@ -17,7 +17,7 @@ namespace rwe
 
     void UiListBox::render(UiRenderService& context) const
     {
-        int lines = std::min<int>(numberOfLines(), items.size());
+        auto lines = std::min<int>(numberOfLines(), items.size());
 
         for (int i = 0; i < lines; ++i)
         {