Correct handling of 3d floor plane texture getting.

ZDoom · Jul 7, 2019 · dd2a795 · dd2a795
1 parent 9b74828
commit dd2a795
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/scripting/vmthunks.cpp b/src/scripting/vmthunks.cpp
@@ -1388,14 +1388,18 @@ DEFINE_ACTION_FUNCTION_NATIVE(_Sector, SetXOffset, SetXOffset)
 
  static int Get3DFloorTexture(F3DFloor *self, int pos)
  {
-	 return self->model->GetTexture(1-pos).GetIndex();
+ 	 if ( pos )
+ 		 return self->bottom.texture->GetIndex();
+ 	 return self->top.texture->GetIndex();
  }
 
  DEFINE_ACTION_FUNCTION_NATIVE(_F3DFloor, GetTexture, Get3DFloorTexture)
  {
 	 PARAM_SELF_STRUCT_PROLOGUE(F3DFloor);
 	 PARAM_INT(pos);
-	 ACTION_RETURN_INT(self->model->GetTexture(1-pos).GetIndex());
+	 if ( pos )
+		 ACTION_RETURN_INT(self->bottom.texture->GetIndex());
+	 ACTION_RETURN_INT(self->top.texture->GetIndex());
  }
 
  //===========================================================================