From 49cceda15bce75c0c54301c8747e413ee3f436e0 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Fri, 24 Apr 2020 22:43:23 +0100
Subject: [PATCH] Do the same with writing ARCH_FFLOOR values in Lua archiving
code (reading was already dealt with years ago)
---
src/lua_script.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/lua_script.c b/src/lua_script.c
index 7adf62fccc..6b7b122f0b 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -1010,16 +1010,8 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
if (!rover)
WRITEUINT8(save_p, ARCH_NULL);
else {
- ffloor_t *r2;
- UINT16 i = 0;
- // search for id
- for (r2 = rover->target->ffloors; r2; r2 = r2->next)
- {
- if (r2 == rover)
- break;
- i++;
- }
- if (!r2)
+ UINT16 i = P_GetFFloorID(rover);
+ if (i == UINT16_MAX) // invalid ID
WRITEUINT8(save_p, ARCH_NULL);
else
{
--
GitLab