From 6b39b875fc978bc416c8b36555afb5f753532fcc Mon Sep 17 00:00:00 2001 From: Paweł Kołodziejski Date: Sat, 1 May 2004 09:37:24 +0000 Subject: indent svn-id: r13701 --- saga/interface.h | 49 +++++++++---------------------------------------- 1 file changed, 9 insertions(+), 40 deletions(-) (limited to 'saga/interface.h') diff --git a/saga/interface.h b/saga/interface.h index ab38fd41ea..668cb8b4fb 100644 --- a/saga/interface.h +++ b/saga/interface.h @@ -20,17 +20,8 @@ * $Header$ * */ -/* - Description: - - Game interface module private header file - Notes: - - Module dependencies: - - r_script_mod - - r_sprite_mod -*/ +// Game interface module private header file #ifndef SAGA_INTERFACE_H__ #define SAGA_INTERFACE_H__ @@ -43,7 +34,7 @@ namespace Saga { #define COMMAND_DEFAULT_BUTTON 1 -/* Inherit the Earth interface values */ +// Inherit the Earth interface values #define ITE_STATUS_Y 137 #define ITE_STATUS_W 320 #define ITE_STATUS_H 12 @@ -58,7 +49,7 @@ namespace Saga { #define ITE_LPORTRAIT_X 5 #define ITE_LPORTRAIT_Y 4 -/* IHNMAIMS interface values */ +// IHNMAIMS interface values #define IHNM_STATUS_Y 304 #define IHNM_STATUS_W 640 #define IHNM_STATUS_H 24 @@ -74,13 +65,11 @@ namespace Saga { #define IHNM_LPORTRAIT_Y 4 typedef enum R_PANEL_MODES_tag { - PANEL_COMMAND, PANEL_DIALOGUE } R_PANEL_MODES; typedef enum R_BUTTON_FLAGS_tag { - BUTTON_NONE = 0x0, BUTTON_LABEL = 0x01, BUTTON_BITMAP = 0x02, @@ -91,7 +80,6 @@ typedef enum R_BUTTON_FLAGS_tag { #define BUTTON_VERB ( BUTTON_LABEL | BUTTON_BITMAP | BUTTON_SET ) struct R_INTERFACE_BUTTON { - int x1; int y1; int x2; @@ -101,11 +89,9 @@ struct R_INTERFACE_BUTTON { int active_sprite; int flags; int data; - }; struct R_INTERFACE_PANEL { - byte *res; size_t res_len; int x; @@ -118,53 +104,39 @@ struct R_INTERFACE_PANEL { int nbuttons; R_INTERFACE_BUTTON *buttons; R_SPRITELIST *sprites; - }; struct R_INTERFACE_DESC { - int status_y; int status_w; int status_h; int status_txt_y; int status_txt_col; int status_bgcol; - int cmd_txt_col; int cmd_txt_shadowcol; int cmd_txt_hilitecol; int cmd_defaultbutton; - int lportrait_x; int lportrait_y; - }; struct R_INTERFACE_MODULE { - int init; int active; - R_RSCFILE_CONTEXT *i_file_ctxt; - R_INTERFACE_DESC i_desc; - R_PANEL_MODES panel_mode; R_INTERFACE_PANEL c_panel; R_INTERFACE_PANEL d_panel; - char status_txt[R_STATUS_TEXT_LEN]; - int active_portrait; R_SPRITELIST *def_portraits; int active_verb; - R_SCRIPT_THREAD *i_thread; - }; enum INTERFACE_VERBS { - I_VERB_WALKTO, I_VERB_LOOKAT, I_VERB_PICKUP, @@ -176,21 +148,18 @@ enum INTERFACE_VERBS { }; struct R_VERB_DATA { - int i_verb; const char *verb_cvar; char verb_str[R_VERB_STRLIMIT]; int s_verb; - }; -int INTERFACE_HitTest(R_POINT * imouse_pt, int *ibutton); - -int DrawStatusBar(R_SURFACE * ds); -int HandleCommandUpdate(R_SURFACE * ds, R_POINT * imouse_pt); -int HandleCommandClick(R_SURFACE * ds, R_POINT * imouse_pt); -int HandlePlayfieldUpdate(R_SURFACE * ds, R_POINT * imouse_pt); -int HandlePlayfieldClick(R_SURFACE * ds, R_POINT * imouse_pt); +int INTERFACE_HitTest(R_POINT *imouse_pt, int *ibutton); +int DrawStatusBar(R_SURFACE *ds); +int HandleCommandUpdate(R_SURFACE *ds, R_POINT *imouse_pt); +int HandleCommandClick(R_SURFACE *ds, R_POINT *imouse_pt); +int HandlePlayfieldUpdate(R_SURFACE *ds, R_POINT *imouse_pt); +int HandlePlayfieldClick(R_SURFACE *ds, R_POINT *imouse_pt); } // End of namespace Saga -- cgit v1.2.3