aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kiewitz2009-10-26 19:33:07 +0000
committerMartin Kiewitz2009-10-26 19:33:07 +0000
commitefd41ffc46d993a266920aa204fbb87789c73b92 (patch)
tree8d131da5f18f68d1454c125aa4b85b466a530529
parentc7476aa16ffe54020f5fea7ad74e76f2e67584cf (diff)
downloadscummvm-rg350-efd41ffc46d993a266920aa204fbb87789c73b92.tar.gz
scummvm-rg350-efd41ffc46d993a266920aa204fbb87789c73b92.tar.bz2
scummvm-rg350-efd41ffc46d993a266920aa204fbb87789c73b92.zip
SCI/newgui: SciGuiText created
svn-id: r45412
-rw-r--r--dists/msvc8/sci.vcproj2
-rw-r--r--dists/msvc9/sci.vcproj2
-rw-r--r--engines/sci/gui/gui_text.cpp49
-rw-r--r--engines/sci/gui/gui_text.h55
-rw-r--r--engines/sci/module.mk1
5 files changed, 109 insertions, 0 deletions
diff --git a/dists/msvc8/sci.vcproj b/dists/msvc8/sci.vcproj
index 404a35dfae..bc78051367 100644
--- a/dists/msvc8/sci.vcproj
+++ b/dists/msvc8/sci.vcproj
@@ -97,6 +97,8 @@
<File RelativePath="..\..\engines\sci\gui\gui_picture.h" />
<File RelativePath="..\..\engines\sci\gui\gui_screen.cpp" />
<File RelativePath="..\..\engines\sci\gui\gui_screen.h" />
+ <File RelativePath="..\..\engines\sci\gui\gui_text.cpp" />
+ <File RelativePath="..\..\engines\sci\gui\gui_text.h" />
<File RelativePath="..\..\engines\sci\gui\gui_transitions.cpp" />
<File RelativePath="..\..\engines\sci\gui\gui_transitions.h" />
<File RelativePath="..\..\engines\sci\gui\gui_view.cpp" />
diff --git a/dists/msvc9/sci.vcproj b/dists/msvc9/sci.vcproj
index f00496ad60..0e8abf8d8f 100644
--- a/dists/msvc9/sci.vcproj
+++ b/dists/msvc9/sci.vcproj
@@ -98,6 +98,8 @@
<File RelativePath="..\..\engines\sci\gui\gui_picture.h" />
<File RelativePath="..\..\engines\sci\gui\gui_screen.cpp" />
<File RelativePath="..\..\engines\sci\gui\gui_screen.h" />
+ <File RelativePath="..\..\engines\sci\gui\gui_text.cpp" />
+ <File RelativePath="..\..\engines\sci\gui\gui_text.h" />
<File RelativePath="..\..\engines\sci\gui\gui_transitions.cpp" />
<File RelativePath="..\..\engines\sci\gui\gui_transitions.h" />
<File RelativePath="..\..\engines\sci\gui\gui_view.cpp" />
diff --git a/engines/sci/gui/gui_text.cpp b/engines/sci/gui/gui_text.cpp
new file mode 100644
index 0000000000..3ba99f0566
--- /dev/null
+++ b/engines/sci/gui/gui_text.cpp
@@ -0,0 +1,49 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/util.h"
+#include "common/stack.h"
+#include "graphics/primitives.h"
+
+#include "sci/sci.h"
+#include "sci/gui/gui_screen.h"
+#include "sci/gui/gui_text.h"
+
+namespace Sci {
+
+SciGuiText::SciGuiText(SciGuiScreen *screen)
+ : _screen(screen) {
+ init();
+}
+
+SciGuiText::~SciGuiText() {
+}
+
+void SciGuiText::init() {
+ _codeFonts = NULL; _codeFontsCount = 0;
+ _codeColors = NULL; _codeColorsCount = 0;
+}
+
+} // End of namespace Sci
diff --git a/engines/sci/gui/gui_text.h b/engines/sci/gui/gui_text.h
new file mode 100644
index 0000000000..856e3d47ce
--- /dev/null
+++ b/engines/sci/gui/gui_text.h
@@ -0,0 +1,55 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef SCI_GUI_TEXT_H
+#define SCI_GUI_TEXT_H
+
+namespace Sci {
+
+#define SCI_TEXT_ALIGNMENT_RIGHT -1
+#define SCI_TEXT_ALIGNMENT_CENTER 1
+#define SCI_TEXT_ALIGNMENT_LEFT 0
+
+class SciGuiScreen;
+class SciGuiFont;
+class SciGuiText {
+public:
+ SciGuiText(SciGuiScreen *screen);
+ ~SciGuiText();
+
+private:
+ void init(void);
+
+ SciGuiScreen *_screen;
+
+ int _codeFontsCount;
+ GuiResourceId *_codeFonts;
+ int _codeColorsCount;
+ uint16 *_codeColors;
+};
+
+} // End of namespace Sci
+
+#endif
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index 8b038bf286..4437cc03ac 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -54,6 +54,7 @@ MODULE_OBJS := \
gui/gui_palette.o \
gui/gui_picture.o \
gui/gui_screen.o \
+ gui/gui_text.o \
gui/gui_transitions.o \
gui/gui_view.o \
gui/gui_windowmgr.o \