[Scummvm-cvs-logs] SF.net SVN: scummvm:[45412] scummvm/trunk
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Mon Oct 26 20:33:07 CET 2009
Revision: 45412
http://scummvm.svn.sourceforge.net/scummvm/?rev=45412&view=rev
Author: m_kiewitz
Date: 2009-10-26 19:33:07 +0000 (Mon, 26 Oct 2009)
Log Message:
-----------
SCI/newgui: SciGuiText created
Modified Paths:
--------------
scummvm/trunk/dists/msvc8/sci.vcproj
scummvm/trunk/dists/msvc9/sci.vcproj
scummvm/trunk/engines/sci/module.mk
Added Paths:
-----------
scummvm/trunk/engines/sci/gui/gui_text.cpp
scummvm/trunk/engines/sci/gui/gui_text.h
Modified: scummvm/trunk/dists/msvc8/sci.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/sci.vcproj 2009-10-26 19:06:36 UTC (rev 45411)
+++ scummvm/trunk/dists/msvc8/sci.vcproj 2009-10-26 19:33:07 UTC (rev 45412)
@@ -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" />
Modified: scummvm/trunk/dists/msvc9/sci.vcproj
===================================================================
--- scummvm/trunk/dists/msvc9/sci.vcproj 2009-10-26 19:06:36 UTC (rev 45411)
+++ scummvm/trunk/dists/msvc9/sci.vcproj 2009-10-26 19:33:07 UTC (rev 45412)
@@ -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" />
Copied: scummvm/trunk/engines/sci/gui/gui_text.cpp (from rev 45410, scummvm/trunk/engines/sci/gui/gui_gfx.cpp)
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_text.cpp (rev 0)
+++ scummvm/trunk/engines/sci/gui/gui_text.cpp 2009-10-26 19:33:07 UTC (rev 45412)
@@ -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
Copied: scummvm/trunk/engines/sci/gui/gui_text.h (from rev 45410, scummvm/trunk/engines/sci/gui/gui_gfx.h)
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_text.h (rev 0)
+++ scummvm/trunk/engines/sci/gui/gui_text.h 2009-10-26 19:33:07 UTC (rev 45412)
@@ -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
Modified: scummvm/trunk/engines/sci/module.mk
===================================================================
--- scummvm/trunk/engines/sci/module.mk 2009-10-26 19:06:36 UTC (rev 45411)
+++ scummvm/trunk/engines/sci/module.mk 2009-10-26 19:33:07 UTC (rev 45412)
@@ -54,6 +54,7 @@
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 \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list