Refactor of CPlayerManager::IsValidPlayerModel() based on issue #2244 (#2250)

* Refactor of CPlayerManager::IsValidPlayerModel() based on issue #2244

* added requested changes from review

Author: delinx

Server/mods/deathmatch/logic/CPlayerManager.cpp

@@ -320,12 +320,31 @@ void CPlayerManager::Broadcast(const CPacket& Packet, const std::multimap<ushort
     DoBroadcast(Packet, groupMap);
 }
 
-bool CPlayerManager::IsValidPlayerModel(unsigned short usPlayerModel)
+bool CPlayerManager::IsValidPlayerModel(unsigned short model)
 {
-    return (usPlayerModel == 0 || usPlayerModel == 1 || usPlayerModel == 2 || usPlayerModel == 7 ||
-            (usPlayerModel >= 9 && usPlayerModel != 208 && usPlayerModel != 149 && usPlayerModel != 119 && usPlayerModel != 86 && usPlayerModel != 74 &&
-             usPlayerModel != 65 && usPlayerModel != 42 && usPlayerModel <= 272) ||
-            (usPlayerModel >= 274 && usPlayerModel <= 288) || (usPlayerModel >= 290 && usPlayerModel <= 312));
+    if (model > 312)
+        return false; // TODO: On client side maybe check if a model was allocated with engineRequestModel and it is a ped
+        
+    switch (model)
+    {
+        case 3:
+        case 4:
+        case 5:
+        case 6:
+        case 8:
+        case 42:
+        case 65:
+        case 74:
+        case 86:
+        case 119:
+        case 149:
+        case 208:
+        case 273:
+        case 289:
+            return false;
+        default:
+            return true;
+    }
 }
 
 void CPlayerManager::ClearElementData(CElement* pElement, const std::string& name)

Server/mods/deathmatch/logic/CPlayerManager.h

@@ -53,7 +53,7 @@ class CPlayerManager
     static void Broadcast(const CPacket& Packet, const std::vector<CPlayer*>& sendList);
     static void Broadcast(const CPacket& Packet, const std::multimap<ushort, CPlayer*>& groupMap);
 
-    static bool IsValidPlayerModel(unsigned short usPlayerModel);
+    static bool IsValidPlayerModel(unsigned short model);
 
     void ClearElementData(CElement* pElement, const std::string& name);
     void ClearElementData(CElement* pElement);