aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sky/disk.cpp2
-rw-r--r--sky/struc.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/sky/disk.cpp b/sky/disk.cpp
index 2a74f66802..056276d9e1 100644
--- a/sky/disk.cpp
+++ b/sky/disk.cpp
@@ -74,7 +74,7 @@ uint16 *SkyState::load_file(uint16 file_nr, uint8 *dest)
uint32 eax, ecx;
int32 bytes_read;
uint8 *file_ptr, *esiptr, *ediptr;
- s file_header;
+ dataFileHeader file_header;
#ifdef file_order_chk
warning("File order checking not implemented yet!\n");
diff --git a/sky/struc.h b/sky/struc.h
index 2e111a5d86..24b8661823 100644
--- a/sky/struc.h
+++ b/sky/struc.h
@@ -19,7 +19,7 @@
*
*/
-typedef struct dataFileHeader
+struct dataFileHeader
{
uint16 flag; // bit 0: set for colour data, clear for not
// bit 1: set for compressed, clear for uncompressed
@@ -34,5 +34,5 @@ typedef struct dataFileHeader
uint16 s_offset_x;
uint16 s_offset_y;
uint16 s_compressed_size;
-}s;
+};