Merge f4b36b8f73 into c636c538eb

src/BuiltinCommands.cpp

@@ -69,10 +69,10 @@ static void setValuePlayer(CNSocket* sock, CNPacketData* data) {
 
     // Handle serverside value-changes
     switch (setData->iSetValueType) {
-    case CN_GM_SET_VALUE_TYPE__HP:
+    case 1:
         response.iSetValue = plr->HP = setData->iSetValue;
         break;
-    case CN_GM_SET_VALUE_TYPE__WEAPON_BATTERY :
+    case 2:
         plr->batteryW = setData->iSetValue;
 
         // caps
@@ -81,7 +81,7 @@ static void setValuePlayer(CNSocket* sock, CNPacketData* data) {
 
         response.iSetValue = plr->batteryW;
         break;
-    case CN_GM_SET_VALUE_TYPE__NANO_BATTERY:
+    case 3:
         plr->batteryN = setData->iSetValue;
 
         // caps
@@ -90,17 +90,13 @@ static void setValuePlayer(CNSocket* sock, CNPacketData* data) {
 
         response.iSetValue = plr->batteryN;
         break;
-    case CN_GM_SET_VALUE_TYPE__FUSION_MATTER:
+    case 4:
         Missions::updateFusionMatter(sock, setData->iSetValue - plr->fusionmatter);
         response.iSetValue = plr->fusionmatter;
         break;
-    case CN_GM_SET_VALUE_TYPE__CANDY:
+    case 5:
         response.iSetValue = plr->money = setData->iSetValue;
         break;
-    case CN_GM_SET_VALUE_TYPE__SPEED:
-    case CN_GM_SET_VALUE_TYPE__JUMP:
-        response.iSetValue = setData->iSetValue;
-        break;
     }
 
     response.iPC_ID = setData->iPC_ID;