summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/JSystem/J2DGraph/J2DPicture/J2DPicture.h14
-rw-r--r--include/f/f_op/f_op_msg_mng.h4
2 files changed, 9 insertions, 9 deletions
diff --git a/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h
index 996b1d22ad..0699da15b3 100644
--- a/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h
+++ b/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h
@@ -2,8 +2,8 @@
#define J2DPICTURE_H_
#include "JSystem/J2DGraph/J2DPane.h"
-#include "JSystem/JUtility/JUTTexture.h"
#include "JSystem/JGeometry/JGeometry.h"
+#include "JSystem/JUtility/JUTTexture.h"
#include "dolphin/types.h"
// define and move to appropriate header later
@@ -12,7 +12,7 @@ class JUTPalette;
class J2DPicture : public J2DPane {
public:
virtual void initiate();
- virtual u32 prepareTexture(); // return type may be wrong
+ virtual u32 prepareTexture(); // return type may be wrong
virtual void append(const ResTIMG*, f32);
virtual void append(const ResTIMG*, JUTPalette*, f32);
virtual void append(const char*, f32);
@@ -31,11 +31,11 @@ public:
virtual void remove(u8);
virtual void remove(void);
virtual void remove(JUTTexture*);
- virtual void draw(f32,f32,bool,bool,bool);
- virtual void draw(f32,f32,u8,bool,bool,bool);
- virtual void draw(f32,f32,f32,f32,bool,bool,bool);
- virtual void drawOut(f32,f32,f32,f32,f32,f32);
- virtual void drawOut(f32,f32,f32,f32,f32,f32,f32,f32);
+ virtual void draw(f32, f32, bool, bool, bool);
+ virtual void draw(f32, f32, u8, bool, bool, bool);
+ virtual void draw(f32, f32, f32, f32, bool, bool, bool);
+ virtual void drawOut(f32, f32, f32, f32, f32, f32);
+ virtual void drawOut(f32, f32, f32, f32, f32, f32, f32, f32);
virtual void drawOut(const JGeometry::TBox2<float>&, const JGeometry::TBox2<float>&);
virtual void load(_GXTexMapID, u8);
virtual void load(u8);
diff --git a/include/f/f_op/f_op_msg_mng.h b/include/f/f_op/f_op_msg_mng.h
index f5f16d7716..e9c0a1723b 100644
--- a/include/f/f_op/f_op_msg_mng.h
+++ b/include/f/f_op/f_op_msg_mng.h
@@ -1,9 +1,9 @@
#ifndef F_F_OP_MSG_MNG_H_
#define F_F_OP_MSG_MNG_H_
-#include "dolphin/types.h"
-#include "f/f_op/f_op_actor.h"
#include "JSystem/J2DGraph/J2DPane.h"
#include "JSystem/J2DGraph/J2DPicture/J2DPicture.h"
+#include "dolphin/types.h"
+#include "f/f_op/f_op_actor.h"
#endif \ No newline at end of file