From ffc2aa4e4f41aa679d773ccafdec87bf8d7b5e85 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Mon, 13 Jun 2011 11:57:24 +0200 Subject: CGE: Format code --- engines/cge/talk.h | 92 +++++++++++++++++++++++------------------------------- 1 file changed, 39 insertions(+), 53 deletions(-) (limited to 'engines/cge/talk.h') diff --git a/engines/cge/talk.h b/engines/cge/talk.h index aab6834c28..568fd82964 100644 --- a/engines/cge/talk.h +++ b/engines/cge/talk.h @@ -25,86 +25,72 @@ * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon */ -#ifndef __TALK__ -#define __TALK__ +#ifndef __TALK__ +#define __TALK__ -#include "cge/vga13h.h" -#include "cge/general.h" -#include "cge/jbw.h" -//#include +#include "cge/vga13h.h" +#include "cge/general.h" +#include "cge/jbw.h" namespace CGE { -#define TEXT_FG DARK // foreground color -#define TEXT_BG GRAY // background color -#define TEXT_HM (6&~1) // EVEN horizontal margins! -#define TEXT_VM 5 // vertical margins -#define TEXT_LS 2 // line spacing -#define TEXT_RD 3 // rounded corners +#define TEXT_FG DARK // foreground color +#define TEXT_BG GRAY // background color +#define TEXT_HM (6&~1) // EVEN horizontal margins! +#define TEXT_VM 5 // vertical margins +#define TEXT_LS 2 // line spacing +#define TEXT_RD 3 // rounded corners -#define FONT_HIG 8 -#define FONT_EXT ".CFT" +#define FONT_HIG 8 +#define FONT_EXT ".CFT" #define MAXPATH 128 -class FONT -{ - char Path[MAXPATH]; - void Load (void); +class FONT { + char Path[MAXPATH]; + void Load(void); public: // static uint8 Wid[256]; // static uint16 Pos[256]; // static uint8 Map[256*8]; - uint8 * Wid; - uint16 * Pos; - uint8 * Map; - FONT (const char * name); - ~FONT (void); - uint16 Width (const char * text); - void Save (void); + uint8 *Wid; + uint16 *Pos; + uint8 *Map; + FONT(const char *name); + ~FONT(void); + uint16 Width(const char *text); + void Save(void); }; +enum TBOX_STYLE { PURE, RECT, ROUND }; - -enum TBOX_STYLE { PURE, RECT, ROUND }; - - - -class TALK : public SPRITE -{ +class TALK : public SPRITE { protected: - TBOX_STYLE Mode; - BITMAP * TS[2]; - BITMAP * Box(uint16 w, uint16 h); + TBOX_STYLE Mode; + BITMAP *TS[2]; + BITMAP *Box(uint16 w, uint16 h); public: - static FONT Font; - TALK (const char * tx, TBOX_STYLE mode = PURE); - TALK (void); - //~TALK (void); - virtual void Update (const char * tx); - virtual void Update (void) {} - void PutLine (int line, const char * text); + static FONT Font; + TALK(const char *tx, TBOX_STYLE mode = PURE); + TALK(void); + //~TALK (void); + virtual void Update(const char *tx); + virtual void Update(void) {} + void PutLine(int line, const char *text); }; - - - - - -class INFO_LINE : public TALK -{ - const char * OldTxt; +class INFO_LINE : public TALK { + const char *OldTxt; public: - INFO_LINE (uint16 wid); - void Update (const char * tx); + INFO_LINE(uint16 wid); + void Update(const char *tx); }; - } // End of namespace CGE #endif -- cgit v1.2.3