diff options
| author | Alex Marshall <SquidMan72@gmail.com> | 2009-04-19 23:47:03 -0700 |
|---|---|---|
| committer | Alex Marshall <SquidMan72@gmail.com> | 2009-04-19 23:47:03 -0700 |
| commit | 4d7b578ad9737d26a0dd727e58443a8d01c0c8da (patch) | |
| tree | 3246a541e0308faf6e895dc27190973ea295cff0 | |
| parent | 8182882e78fec04d159ae979d365eeffe4915ce6 (diff) | |
Bah, small, stupid fix
Diffstat (limited to '')
| -rw-r--r-- | laichzeit/brlan.c | 8 | ||||
| -rw-r--r-- | laichzeit/brlan.h | 2 | ||||
| -rw-r--r-- | laichzeit/brlyt.c | 23 | ||||
| -rw-r--r-- | laichzeit/brlyt.h | 17 |
4 files changed, 33 insertions, 17 deletions
diff --git a/laichzeit/brlan.c b/laichzeit/brlan.c index 2d121cd..c171572 100644 --- a/laichzeit/brlan.c +++ b/laichzeit/brlan.c @@ -104,3 +104,11 @@ void LaichAnim_EndTag(BRLAN* brlan, int tag) { brlan->tags[tag].done = 1; } + +u8* LaichAnim_Compile(BRLAN* brlan, u32* size); +{ + *size = 0; + return NULL; +} + + diff --git a/laichzeit/brlan.h b/laichzeit/brlan.h index 30fe311..bab4c39 100644 --- a/laichzeit/brlan.h +++ b/laichzeit/brlan.h @@ -86,6 +86,6 @@ void LaichAnim_AddTriplet(BRLAN* brlan, int tag, int anim, \ f32 frame, f32 value, f32 interpolation); void LaichAnim_EndAnim(BRLAN* brlan, int tag, int anim); void LaichAnim_EndTag(BRLAN* brlan, int tag); -u8* LaichAnim_Compile(BRLAN* brlan); +u8* LaichAnim_Compile(BRLAN* brlan, u32* size); #endif //BRLAN_H diff --git a/laichzeit/brlyt.c b/laichzeit/brlyt.c index 3c20589..e670487 100644 --- a/laichzeit/brlyt.c +++ b/laichzeit/brlyt.c @@ -19,21 +19,6 @@ #include "brlyt.h" #include "c_oop.h" -#define RGBA8(w, x, y, z)\ -( \ - (((u32)(z & 0xFF)) << 24) | \ - (((u32)(w & 0xFF)) << 16) | \ - (((u32)(x & 0xFF)) << 8) | \ - (((u32)(y & 0xFF)) << 0) \ -) - -#define RGB565(w, x, y, z)\ -( \ - (((u16)((w & 0xFF) >> 3)) << 11) | \ - (((u16)((x & 0xFF) >> 2)) << 6) | \ - (((u16)((y & 0xFF) >> 3)) << 0) \ -) - static int AddEntryToBRLYT(BRLYT* brlyt, LYTEntry entry) { return AddObjectToList((u8**)&brlyt->entries, (u32*)&brlyt->entrycnt, \ @@ -446,3 +431,11 @@ void LaichLyt_EndPane(BRLYT* brlyt, int pane) { LaichLyt_EndEntry(brlyt, pane); } + +u8* LaichLyt_Compile(BRLYT* brlyt, u32* size) +{ + size = 0; + return NULL; +} + + diff --git a/laichzeit/brlyt.h b/laichzeit/brlyt.h index 2588d78..33d9aef 100644 --- a/laichzeit/brlyt.h +++ b/laichzeit/brlyt.h @@ -19,6 +19,21 @@ #define USE_BRLYT +#define RGBA8(w, x, y, z)\ +( \ + (((u32)(z & 0xFF)) << 24) | \ + (((u32)(w & 0xFF)) << 16) | \ + (((u32)(x & 0xFF)) << 8) | \ + (((u32)(y & 0xFF)) << 0) \ +) + +#define RGB565(w, x, y, z)\ +( \ + (((u16)((w & 0xFF) >> 3)) << 11) | \ + (((u16)((x & 0xFF) >> 2)) << 6) | \ + (((u16)((y & 0xFF) >> 3)) << 0) \ +) + typedef enum { LYT_FONT_DEFAULT = 0 // Default. @@ -339,7 +354,7 @@ void LaichLyt_EndMat (BRLYT* brlyt, int mat ); void LaichLyt_EndPic (BRLYT* brlyt, int pic ); void LaichLyt_EndText (BRLYT* brlyt, int text ); void LaichLyt_EndPane (BRLYT* brlyt, int pane ); -u8* LaichLyt_Compile(BRLYT* brlyt); +u8* LaichLyt_Compile (BRLYT* brlyt, u32* size); #endif //BRLYT_H |