summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/fileio.cpp2
-rw-r--r--src/saveload/group_sl.cpp14
-rw-r--r--src/table/landscape_sprite.h248
-rw-r--r--src/video/cocoa/cocoa_v.mm4
4 files changed, 134 insertions, 134 deletions
diff --git a/src/fileio.cpp b/src/fileio.cpp
index 924141a85..43d5daf2b 100644
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -238,7 +238,7 @@ static void FioFreeHandle()
* @param slot Index to assign.
* @param filename Name of the file at the disk.
* @param subdir The sub directory to search this file in.
- */
+ */
void FioOpenFile(int slot, const char *filename, Subdirectory subdir)
{
FILE *f;
diff --git a/src/saveload/group_sl.cpp b/src/saveload/group_sl.cpp
index 6b833137b..7eaf76c95 100644
--- a/src/saveload/group_sl.cpp
+++ b/src/saveload/group_sl.cpp
@@ -15,13 +15,13 @@
#include "saveload.h"
static const SaveLoad _group_desc[] = {
- SLE_CONDVAR(Group, name, SLE_NAME, 0, 83),
- SLE_CONDSTR(Group, name, SLE_STR | SLF_ALLOW_CONTROL, 0, 84, SL_MAX_VERSION),
- SLE_CONDNULL(2, 0, 163), // num_vehicle
- SLE_VAR(Group, owner, SLE_UINT8),
- SLE_VAR(Group, vehicle_type, SLE_UINT8),
- SLE_VAR(Group, replace_protection, SLE_BOOL),
- SLE_END()
+ SLE_CONDVAR(Group, name, SLE_NAME, 0, 83),
+ SLE_CONDSTR(Group, name, SLE_STR | SLF_ALLOW_CONTROL, 0, 84, SL_MAX_VERSION),
+ SLE_CONDNULL(2, 0, 163), // num_vehicle
+ SLE_VAR(Group, owner, SLE_UINT8),
+ SLE_VAR(Group, vehicle_type, SLE_UINT8),
+ SLE_VAR(Group, replace_protection, SLE_BOOL),
+ SLE_END()
};
static void Save_GRPS()
diff --git a/src/table/landscape_sprite.h b/src/table/landscape_sprite.h
index 7058ee033..ceadd3e58 100644
--- a/src/table/landscape_sprite.h
+++ b/src/table/landscape_sprite.h
@@ -12,134 +12,134 @@
static const SpriteID END = 0xFFFF;
static const SpriteID _landscape_spriteindexes_arctic[] = {
- 0xF67, 0xF9F,
- 0xAAD, 0xAB0,
- 0x83A, 0x845,
- 0xFA0, 0xFC9,
- 0x43F, 0x45E,
- 0x566, 0x56D,
- 0x945, 0x94C,
- 0x3ED, 0x40C,
- 0x515, 0x51C,
- 0x55A, 0x561,
- 0x534, 0x546,
- 0x93D, 0x944,
- 0x955, 0x95C,
- 0xFDD, 0xFEC,
- 0x87D, 0x883,
- 0xA2B, 0xA39,
- 0x497, 0x4B0,
- 0x572, 0x575,
- 0x94D, 0x954,
- 0x818, 0x81D,
- 0x3DE, 0x3EB,
-0x1212, 0x1212,
-END
+ 0xF67, 0xF9F,
+ 0xAAD, 0xAB0,
+ 0x83A, 0x845,
+ 0xFA0, 0xFC9,
+ 0x43F, 0x45E,
+ 0x566, 0x56D,
+ 0x945, 0x94C,
+ 0x3ED, 0x40C,
+ 0x515, 0x51C,
+ 0x55A, 0x561,
+ 0x534, 0x546,
+ 0x93D, 0x944,
+ 0x955, 0x95C,
+ 0xFDD, 0xFEC,
+ 0x87D, 0x883,
+ 0xA2B, 0xA39,
+ 0x497, 0x4B0,
+ 0x572, 0x575,
+ 0x94D, 0x954,
+ 0x818, 0x81D,
+ 0x3DE, 0x3EB,
+ 0x1212, 0x1212,
+ END
};
static const SpriteID _landscape_spriteindexes_tropic[] = {
- 0xF67, 0xF9F,
- 0xAAD, 0xAB0,
- 0xFA0, 0xFC9,
- 0x43F, 0x45E,
- 0x566, 0x56D,
- 0x945, 0x94C,
- 0x3ED, 0x40C,
- 0x515, 0x51C,
- 0x55A, 0x561,
- 0x547, 0x559,
- 0x93D, 0x944,
- 0x955, 0x95C,
- 0xFDD, 0xFEC,
- 0x87D, 0x883,
- 0xA2B, 0xA39,
- 0x497, 0x4B0,
- 0x572, 0x575,
- 0x94D, 0x954,
- 0x5AE, 0x5AF,
-0x118D, 0x11D8,
- 0x534, 0x546,
- 0x40D, 0x426,
- 0x45F, 0x478,
- 0x4B1, 0x4CA,
- 0x95D, 0x97C,
- 0x3DE, 0x3EB,
- 0x562, 0x565,
- 0x56E, 0x571,
- 0x57A, 0x57D,
- 0x83A, 0x845,
- 0xFF5, 0xFF5,
- 0xFF8, 0xFF8,
-0x1212, 0x1212,
-END
+ 0xF67, 0xF9F,
+ 0xAAD, 0xAB0,
+ 0xFA0, 0xFC9,
+ 0x43F, 0x45E,
+ 0x566, 0x56D,
+ 0x945, 0x94C,
+ 0x3ED, 0x40C,
+ 0x515, 0x51C,
+ 0x55A, 0x561,
+ 0x547, 0x559,
+ 0x93D, 0x944,
+ 0x955, 0x95C,
+ 0xFDD, 0xFEC,
+ 0x87D, 0x883,
+ 0xA2B, 0xA39,
+ 0x497, 0x4B0,
+ 0x572, 0x575,
+ 0x94D, 0x954,
+ 0x5AE, 0x5AF,
+ 0x118D, 0x11D8,
+ 0x534, 0x546,
+ 0x40D, 0x426,
+ 0x45F, 0x478,
+ 0x4B1, 0x4CA,
+ 0x95D, 0x97C,
+ 0x3DE, 0x3EB,
+ 0x562, 0x565,
+ 0x56E, 0x571,
+ 0x57A, 0x57D,
+ 0x83A, 0x845,
+ 0xFF5, 0xFF5,
+ 0xFF8, 0xFF8,
+ 0x1212, 0x1212,
+ END
};
static const SpriteID _landscape_spriteindexes_toyland[] = {
- 0xF54, 0xF9F,
- 0xFDD, 0xFE5,
- 0xFEC, 0xFEC,
- 0xFA0, 0xFC9,
- 0x818, 0x81D,
- 0x521, 0x546,
- 0x57E, 0x57F,
- 0x3ED, 0x40C,
- 0x43F, 0x45E,
- 0x491, 0x4B0,
- 0xA48, 0xA48,
- 0x4FB, 0x50A,
- 0x55A, 0x561,
- 0x566, 0x56D,
- 0x572, 0x579,
- 0x427, 0x42C,
- 0x479, 0x47E,
- 0x4CB, 0x4D0,
- 0x4EF, 0x4FA,
- 0xE9D, 0xECC,
- 0xF3D, 0xF40,
- 0xB59, 0xB60,
- 0xE5D, 0xE6C,
- 0xA49, 0xA59,
- 0xA63, 0xA68,
- 0xA5A, 0xA62,
- 0xA78, 0xA83,
- 0xA69, 0xA77,
- 0xA84, 0xAA3,
- 0xAA7, 0xAAC,
- 0xA2B, 0xA47,
- 0x3DE, 0x3EB,
- 0x47F, 0x488,
- 0x4D1, 0x4DA,
- 0x42D, 0x436,
- 0x515, 0x51C,
- 0x580, 0x585,
- 0xC14, 0xCB3,
- 0xAAD, 0xAB0,
- 0xAB5, 0xB00,
- 0xB69, 0xB70,
- 0xB61, 0xB68,
- 0xBC9, 0xBD0,
- 0xBD9, 0xBE0,
- 0xBA9, 0xBB0,
- 0xBC1, 0xBC4,
- 0x2D0, 0x2D0,
- 0xAA5, 0xAA6,
- 0x50F, 0x50F,
- 0x2EA, 0x2EA,
- 0x2ED, 0x2EE,
- 0x512, 0x513,
- 0x4EB, 0x4EE,
- 0x4E7, 0x4EA,
- 0x985, 0xA28,
-0x10E4, 0x1133,
- 0x93D, 0x95C,
- 0x97D, 0x984,
- 0x7DA, 0x7DA,
- 0x2E6, 0x2E6,
- 0x1, 0x1,
- 0xE54, 0xE54,
- 0x51F, 0x520,
- 0x514, 0x514,
- 0x511, 0x511,
- 0x322, 0x322,
-END
+ 0xF54, 0xF9F,
+ 0xFDD, 0xFE5,
+ 0xFEC, 0xFEC,
+ 0xFA0, 0xFC9,
+ 0x818, 0x81D,
+ 0x521, 0x546,
+ 0x57E, 0x57F,
+ 0x3ED, 0x40C,
+ 0x43F, 0x45E,
+ 0x491, 0x4B0,
+ 0xA48, 0xA48,
+ 0x4FB, 0x50A,
+ 0x55A, 0x561,
+ 0x566, 0x56D,
+ 0x572, 0x579,
+ 0x427, 0x42C,
+ 0x479, 0x47E,
+ 0x4CB, 0x4D0,
+ 0x4EF, 0x4FA,
+ 0xE9D, 0xECC,
+ 0xF3D, 0xF40,
+ 0xB59, 0xB60,
+ 0xE5D, 0xE6C,
+ 0xA49, 0xA59,
+ 0xA63, 0xA68,
+ 0xA5A, 0xA62,
+ 0xA78, 0xA83,
+ 0xA69, 0xA77,
+ 0xA84, 0xAA3,
+ 0xAA7, 0xAAC,
+ 0xA2B, 0xA47,
+ 0x3DE, 0x3EB,
+ 0x47F, 0x488,
+ 0x4D1, 0x4DA,
+ 0x42D, 0x436,
+ 0x515, 0x51C,
+ 0x580, 0x585,
+ 0xC14, 0xCB3,
+ 0xAAD, 0xAB0,
+ 0xAB5, 0xB00,
+ 0xB69, 0xB70,
+ 0xB61, 0xB68,
+ 0xBC9, 0xBD0,
+ 0xBD9, 0xBE0,
+ 0xBA9, 0xBB0,
+ 0xBC1, 0xBC4,
+ 0x2D0, 0x2D0,
+ 0xAA5, 0xAA6,
+ 0x50F, 0x50F,
+ 0x2EA, 0x2EA,
+ 0x2ED, 0x2EE,
+ 0x512, 0x513,
+ 0x4EB, 0x4EE,
+ 0x4E7, 0x4EA,
+ 0x985, 0xA28,
+ 0x10E4, 0x1133,
+ 0x93D, 0x95C,
+ 0x97D, 0x984,
+ 0x7DA, 0x7DA,
+ 0x2E6, 0x2E6,
+ 0x1, 0x1,
+ 0xE54, 0xE54,
+ 0x51F, 0x520,
+ 0x514, 0x514,
+ 0x511, 0x511,
+ 0x322, 0x322,
+ END
};
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index 9045f3262..9e883928b 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -548,8 +548,8 @@ void cocoaReleaseAutoreleasePool()
driver = drv;
}
/**
- * Minimize the window
- */
+ * Minimize the window
+ */
- (void)miniaturize:(id)sender
{
/* make the alpha channel opaque so anim won't have holes in it */