Bläddra i källkod

resource: do not use bool in resource data

Daniele Bartolini 6 år sedan
förälder
incheckning
4c60ce5d7f
3 ändrade filer med 2 tillägg och 6 borttagningar
  1. 0 3
      src/resource/level_resource.cpp
  2. 1 2
      src/resource/level_resource.h
  3. 1 1
      src/resource/types.h

+ 0 - 3
src/resource/level_resource.cpp

@@ -79,9 +79,6 @@ namespace level_resource_internal
 			opts.write(sounds[i].volume);
 			opts.write(sounds[i].range);
 			opts.write(sounds[i].loop);
-			opts.write(sounds[i]._pad[0]);
-			opts.write(sounds[i]._pad[1]);
-			opts.write(sounds[i]._pad[2]);
 		}
 
 		return 0;

+ 1 - 2
src/resource/level_resource.h

@@ -28,8 +28,7 @@ struct LevelSound
 	Vector3 position;
 	f32 volume;
 	f32 range;
-	bool loop;
-	char _pad[3];
+	u32 loop;
 };
 
 namespace level_resource_internal

+ 1 - 1
src/resource/types.h

@@ -56,7 +56,7 @@ struct UnitResource;
 #define RESOURCE_VERSION_STATE_MACHINE    u32(1)
 #define RESOURCE_VERSION_CONFIG           u32(1)
 #define RESOURCE_VERSION_FONT             u32(1)
-#define RESOURCE_VERSION_LEVEL            u32(1)
+#define RESOURCE_VERSION_LEVEL            u32(2)
 #define RESOURCE_VERSION_MATERIAL         u32(1)
 #define RESOURCE_VERSION_MESH             u32(1)
 #define RESOURCE_VERSION_PACKAGE          u32(1)