Skip to content

Commit 2fc392d

Browse files
committed
Serialise generator.logicName
1 parent b53364a commit 2fc392d

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

TheForceEngine/TFE_DarkForces/generator.cpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace TFE_DarkForces
4141
Wax* wax;
4242
JBool active;
4343

44-
char logicName[256]; // JK: added to store a custom logic name
44+
char logicName[64]; // JK: added to store a custom logic name
4545
};
4646

4747
void generatorTaskFunc(MessageType msg)
@@ -234,7 +234,7 @@ namespace TFE_DarkForces
234234
memset(generator, 0, sizeof(Generator));
235235

236236
generator->type = genType;
237-
strncpy(generator->logicName, logicName, 255);
237+
strncpy(generator->logicName, logicName, 63);
238238
generator->active = 1;
239239
generator->delay = 0;
240240

@@ -361,5 +361,14 @@ namespace TFE_DarkForces
361361
SERIALIZE(ObjState_InitVersion, gen->wanderTime, 0);
362362
serialization_serializeWaxPtr(stream, ObjState_InitVersion, gen->wax);
363363
SERIALIZE(ObjState_InitVersion, gen->active, 0);
364+
365+
u32 len = 0;
366+
if (serialization_getMode() == SMODE_WRITE)
367+
{
368+
len = (u32)strlen(gen->logicName);
369+
}
370+
SERIALIZE(ObjState_CustomLogics, len, 0);
371+
SERIALIZE_BUF(ObjState_CustomLogics, gen->logicName, len);
372+
gen->logicName[len] = 0;
364373
}
365374
} // TFE_DarkForces

TheForceEngine/TFE_Jedi/Level/robjData.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ enum ObjStateVersion : u32
6262
ObjState_VueSmoothing = 3,
6363
ObjState_OneHitCheats = 4,
6464
ObjState_CrouchToggle = 5,
65-
ObjState_CurVersion = ObjState_CrouchToggle,
65+
ObjState_CustomLogics = 6,
66+
ObjState_CurVersion = ObjState_CustomLogics,
6667
};
6768

6869
#define SPRITE_SCALE_FIXED FIXED(10)

0 commit comments

Comments
 (0)