Parse udmf thrust as string

kraflab · Sep 7, 2024 · acb9194 · acb9194
1 parent 801db0a
commit acb9194
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/prboom2/src/dsda/udmf.cpp b/prboom2/src/dsda/udmf.cpp
@@ -579,10 +579,10 @@ static void dsda_ParseUDMFSector(Scanner &scanner) {
       SCAN_INT(sector.scrollceilingmode);
     }
     else if (scanner.StringMatch("xthrust")) {
-      SCAN_FLOAT(sector.xthrust);
+      SCAN_FLOAT_STRING(sector.xthrust);
     }
     else if (scanner.StringMatch("ythrust")) {
-      SCAN_FLOAT(sector.ythrust);
+      SCAN_FLOAT_STRING(sector.ythrust);
     }
     else if (scanner.StringMatch("thrustgroup")) {
       SCAN_INT(sector.thrustgroup);

diff --git a/prboom2/src/dsda/udmf.h b/prboom2/src/dsda/udmf.h
@@ -208,8 +208,8 @@ typedef struct {
   float xscrollceiling;
   float yscrollceiling;
   int scrollceilingmode;
-  float xthrust;
-  float ythrust;
+  char* xthrust;
+  char* ythrust;
   int thrustgroup;
   int thrustlocation;
   char* frictionfactor;

diff --git a/prboom2/src/p_setup.c b/prboom2/src/p_setup.c
@@ -908,7 +908,7 @@ static void P_LoadUDMFSectors(int lump)
                                    dsda_FloatToFixed(ms->yscrollceiling), i, ms->scrollceilingmode);
 
     if ((ms->xthrust || ms->ythrust) && ms->thrustgroup && ms->thrustlocation)
-      dsda_AddThruster(dsda_FloatToFixed(ms->xthrust), dsda_FloatToFixed(ms->ythrust),
+      dsda_AddThruster(dsda_StringToFixed(ms->xthrust), dsda_StringToFixed(ms->ythrust),
                        i, ms->thrustgroup + (ms->thrustlocation << THRUST_LOCATION_SHIFT));
 
     if (ms->flags & UDMF_SECF_DAMAGEHAZARD)