Core: remove MAX_CYLINDERS restriction

Instead of using fixed size arrays, use a new cylinder_table structure.
The code copies the weightsystem code, but is significantly more complex
because cylinders are such an integral part of the core.

Two functions to access the cylinders were added:
get_cylinder() and get_or_create_cylinder()
The former does a simple array access and supposes that the cylinder
exists. The latter is used by the parser(s) and if a cylinder with
the given id does not exist, cylinders up to that id are generated.

One point will make C programmers cringe: the cylinder structure is
passed by value. This is due to the way the table-macros work. A
refactoring of the table macros is planned. It has to be noted that
the size of a cylinder_t is 64 bytes, i.e. 8 long words on a 64-bit
architecture, so passing on the stack is probably not even significantly
slower than passing as reference.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 5 insertions, 2 deletions

diff --git a/core/liquivision.c b/core/liquivision.c
index 1e430bcf1..1ea2b814a 100644
--- a/core/liquivision.c
+++ b/core/liquivision.c
@@ -148,8 +148,11 @@ static void parse_dives(int log_version, const unsigned char *buf, unsigned int
 		dc = &dive->dc;
 
 		/* Just the main cylinder until we can handle the buddy cylinder porperly */
-		for (i = 0; i < 1; i++)
-			fill_default_cylinder(dive, i);
+		for (i = 0; i < 1; i++) {
+			cylinder_t cyl = { 0 };
+			fill_default_cylinder(dive, &cyl);
+			add_to_cylinder_table(&dive->cylinders, i, cyl);
+		}
 
 		// Model 0=Xen, 1,2=Xeo, 4=Lynx, other=Liquivision
 		model = *(buf + ptr);