diff --git a/.gitignore b/.gitignore index ddabf2337..610654100 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,5 @@ game-e3/reports/ tags Thumbs.db .gdb_history +*.cfg +*.cmd diff --git a/src/magic.h b/src/magic.h index 13ca5d517..39d5877e0 100644 --- a/src/magic.h +++ b/src/magic.h @@ -58,7 +58,7 @@ extern "C" { sppobj_t typ; int flag; union { - struct region *r; + struct region *r; //TODO: V117 http://www.viva64.com/en/V117 Memsize type is used in the union. struct unit *u; struct building *b; struct ship *sh; diff --git a/src/util/variant.h b/src/util/variant.h index b65ee0868..4559264ed 100644 --- a/src/util/variant.h +++ b/src/util/variant.h @@ -5,12 +5,12 @@ extern "C" { #endif typedef union variant { - void *v; + void *v; //TODO: V117 http://www.viva64.com/en/V117 Memsize type is used in the union. int i; char c; short s; short sa[2]; - char ca[4]; + char ca[4]; //TODO: V112 http://www.viva64.com/en/V112 Dangerous magic number 4 used: char ca[4];. float f; } variant;