adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unnecessary _ALIGNED_ON macro usage.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2860 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2007-10-30 14:10:17 +00:00
parent b270214597
commit 78972b912e
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.7: Changes towards version 0.7:
- Removed unnecessary _ALIGNED_ON macro usage - SvdB
- The current directory is now among the locations searched for the content - The current directory is now among the locations searched for the content
when no explicit location has been specified. (bug fix) - from Nic when no explicit location has been specified. (bug fix) - from Nic
- Non-3DO Shipspin anims now use Presentations - Michael - Non-3DO Shipspin anims now use Presentations - Michael
sc2/src/sc2code/dummy.c
+1 -1
View File
@@ -33,7 +33,7 @@
typedef struct typedef struct
{ {
MEM_HANDLE handle _ALIGNED_ON(sizeof (MEM_HANDLE)); MEM_HANDLE handle;
RACE_DESC data _ALIGNED_ANY; RACE_DESC data _ALIGNED_ANY;
} CODERES_STRUCT; } CODERES_STRUCT;
sc2/src/sc2code/libs/memlib.h
+3
View File
@@ -100,6 +100,9 @@ typedef UWORD MEM_FLAGS;
typedef struct mem_header { typedef struct mem_header {
MEM_HANDLE handle; MEM_HANDLE handle;
} _ALIGNED_ANY MEM_HEADER; } _ALIGNED_ANY MEM_HEADER;
// _ALIGNED_ANY adds padding to the end of MEM_HEADER, so that the following
// address is aligned for any object (if the address of the MEM_HEADER
// itself is aligned for any object).
#define GET_MEM_HEADER(addr) ((MEM_HEADER *) \ #define GET_MEM_HEADER(addr) ((MEM_HEADER *) \
(((char *) addr) - sizeof (MEM_HEADER))) (((char *) addr) - sizeof (MEM_HEADER)))
sc2/src/sc2code/races.h
+9 -13
View File
@@ -148,16 +148,12 @@ struct race_desc
DATA_STUFF ship_data _ALIGNED_ANY; DATA_STUFF ship_data _ALIGNED_ANY;
INTEL_STUFF cyborg_control _ALIGNED_ANY; INTEL_STUFF cyborg_control _ALIGNED_ANY;
UNINIT_FUNC *uninit_func UNINIT_FUNC *uninit_func;
_ALIGNED_ON(sizeof (UNINIT_FUNC *)); PREPROCESS_FUNC *preprocess_func;
PREPROCESS_FUNC *preprocess_func POSTPROCESS_FUNC *postprocess_func;
_ALIGNED_ON(sizeof (PREPROCESS_FUNC *)); INIT_WEAPON_FUNC *init_weapon_func;
POSTPROCESS_FUNC *postprocess_func
_ALIGNED_ON(sizeof (POSTPROCESS_FUNC *));
INIT_WEAPON_FUNC *init_weapon_func
_ALIGNED_ON(sizeof (INIT_WEAPON_FUNC *));
void *CodeRef _ALIGNED_ON(sizeof (void *)); void *CodeRef;
}; };
#define SHIP_BASE_COMMON \ #define SHIP_BASE_COMMON \
@@ -208,11 +204,11 @@ typedef struct
// In battle: frames left before energy regeneration // In battle: frames left before energy regeneration
BYTE ship_input_state; BYTE ship_input_state;
STATUS_FLAGS cur_status_flags _ALIGNED_ON(sizeof (STATUS_FLAGS)); STATUS_FLAGS cur_status_flags;
STATUS_FLAGS old_status_flags _ALIGNED_ON(sizeof (STATUS_FLAGS)); STATUS_FLAGS old_status_flags;
HELEMENT hShip _ALIGNED_ON(sizeof (HELEMENT)); HELEMENT hShip;
COUNT ShipFacing _ALIGNED_ON(sizeof (COUNT)); COUNT ShipFacing;
} STARSHIP; } STARSHIP;
static inline STARSHIP * static inline STARSHIP *