OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 13:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: OpenPunk:9cdec59810bd8698828619c382103a9b8988068d
Branches Tags
OpenPunk:master
OpenPunk:landlock
OpenPunk:lua-more-better
OpenPunk:refactor
OpenPunk:win32-x86
OpenPunk:patchmap
OpenPunk:lua
OpenPunk:1.6
OpenPunk:1.5.2
OpenPunk:1.5.1
OpenPunk:1.5
OpenPunk:1.4
OpenPunk:1.3
OpenPunk:1.2.1
OpenPunk:1.2
OpenPunk:1.1
OpenPunk:1.0
..
compare: OpenPunk:488082cbd8b5cf6bb225dcce3ea65995f87bb0b9
Branches Tags
OpenPunk:master
OpenPunk:landlock
OpenPunk:lua-more-better
OpenPunk:refactor
OpenPunk:win32-x86
OpenPunk:patchmap
OpenPunk:lua
OpenPunk:1.6
OpenPunk:1.5.2
OpenPunk:1.5.1
OpenPunk:1.5
OpenPunk:1.4
OpenPunk:1.3
OpenPunk:1.2.1
OpenPunk:1.2
OpenPunk:1.1
OpenPunk:1.0

2 Commits
9cdec59810 ... 488082cbd8

Author SHA1 Message Date
FinnHornhoover
488082cbd8
Merge f4b36b8f73 into bd0cc3c212 2023-09-12 20:50:47 -07:00
dongresource
bd0cc3c212 Fix regression with /speed and /jump after previous change 
Also changed the case values to use the client definitions.
 2023-09-13 04:37:49 +02:00
1 changed files with 9 additions and 5 deletions
Show Stats Expand all files Collapse all files

14
src/BuiltinCommands.cpp
View File

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