Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplification

Browse Source
This commit is contained in:
Anuken
2023-11-01 12:23:48 -04:00
parent 90487f4120
commit 9c10a09438
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/mindustry/io/TypeIO.java
View File

@@ -711,8 +711,7 @@ public class TypeIO{
} }
public static void writeStatus(Writes write, StatusEntry entry){ public static void writeStatus(Writes write, StatusEntry entry){
//dynamic effects have the high bit of ID set to 1 write.s(entry.effect.id);
write.s(entry.effect.id | (entry.effect.dynamic ? 1 << 15 : 0));
write.f(entry.time); write.f(entry.time);
//write dynamic fields //write dynamic fields
@@ -742,13 +741,9 @@ public class TypeIO{
short id = read.s(); short id = read.s();
float time = read.f(); float time = read.f();
StatusEntry result = new StatusEntry(); StatusEntry result = new StatusEntry().set(content.getByID(ContentType.status, id), time);
//check if it's dynamic (high bit set to 1), remove it, read multipliers
if((id & (1 << 15)) != 0){
//it's a dynamic effect
id ^= (1 << 15);
if(result.effect.dynamic){
//read flags that store which fields are set //read flags that store which fields are set
int flags = read.ub(); int flags = read.ub();
@@ -761,8 +756,6 @@ public class TypeIO{
if((flags & (1 << 6)) != 0) result.armorOverride = read.f(); if((flags & (1 << 6)) != 0) result.armorOverride = read.f();
} }
result.set(content.getByID(ContentType.status, id), time);
return result; return result;
} }