From 900157b6b440b46673ee83f62eb14856461de5d4 Mon Sep 17 00:00:00 2001 From: stephena Date: Sat, 25 Jun 2005 17:26:32 +0000 Subject: [PATCH] Updated version for another alpha release. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@564 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- stella/src/common/Version.hxx | 4 ++-- stella/src/debugger/Debugger.cxx | 4 ++-- stella/src/emucore/Console.cxx | 6 ++++-- stella/src/gui/Launcher.cxx | 4 ++-- stella/src/gui/PromptWidget.cxx | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/stella/src/common/Version.hxx b/stella/src/common/Version.hxx index a4575d34f..1c5bbe155 100644 --- a/stella/src/common/Version.hxx +++ b/stella/src/common/Version.hxx @@ -13,12 +13,12 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: Version.hxx,v 1.2 2005-06-16 00:55:56 stephena Exp $ +// $Id: Version.hxx,v 1.3 2005-06-25 17:26:28 stephena Exp $ //============================================================================ #ifndef VERSION_HXX #define VERSION_HXX -#define STELLA_VERSION "2.0_alpha" +#define STELLA_VERSION "2.0alpha2" #endif diff --git a/stella/src/debugger/Debugger.cxx b/stella/src/debugger/Debugger.cxx index 0f9af3bc0..90d739e41 100644 --- a/stella/src/debugger/Debugger.cxx +++ b/stella/src/debugger/Debugger.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: Debugger.cxx,v 1.34 2005-06-24 16:36:41 urchlay Exp $ +// $Id: Debugger.cxx,v 1.35 2005-06-25 17:26:32 stephena Exp $ //============================================================================ #include "bspf.hxx" @@ -101,7 +101,7 @@ void Debugger::initializeVideo() userHeight = (userHeight + 3) * kDebuggerLineHeight - 8 + myConsole->mediaSource().height(); - string title = string("Stella version ") + STELLA_VERSION + ": Debugger mode"; + string title = string("Stella ") + STELLA_VERSION + ": Debugger mode"; myOSystem->frameBuffer().initialize(title, kDebuggerWidth, userHeight, false); } diff --git a/stella/src/emucore/Console.cxx b/stella/src/emucore/Console.cxx index 4a47a5c0c..c3bc83976 100644 --- a/stella/src/emucore/Console.cxx +++ b/stella/src/emucore/Console.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: Console.cxx,v 1.59 2005-06-23 01:10:25 urchlay Exp $ +// $Id: Console.cxx,v 1.60 2005-06-25 17:26:32 stephena Exp $ //============================================================================ #include @@ -47,6 +47,7 @@ #include "Menu.hxx" #include "Debugger.hxx" #include "TIADebug.hxx" +#include "Version.hxx" #ifdef SNAPSHOT_SUPPORT #include "Snapshot.hxx" @@ -328,7 +329,8 @@ void Console::saveProperties(string filename, bool merge) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Console::initializeVideo() { - string title = "Stella: \"" + myProperties.get("Cartridge.Name") + "\""; + string title = string("Stella ") + STELLA_VERSION + + ": \"" + myProperties.get("Cartridge.Name") + "\""; myOSystem->frameBuffer().initialize(title, myMediaSource->width() << 1, myMediaSource->height()); diff --git a/stella/src/gui/Launcher.cxx b/stella/src/gui/Launcher.cxx index bace241f2..9829d0d8f 100644 --- a/stella/src/gui/Launcher.cxx +++ b/stella/src/gui/Launcher.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: Launcher.cxx,v 1.6 2005-06-16 00:55:59 stephena Exp $ +// $Id: Launcher.cxx,v 1.7 2005-06-25 17:26:32 stephena Exp $ //============================================================================ #include "Version.hxx" @@ -47,6 +47,6 @@ void Launcher::initialize() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void Launcher::initializeVideo() { - string title = string("Stella version ") + STELLA_VERSION; + string title = string("Stella ") + STELLA_VERSION; myOSystem->frameBuffer().initialize(title, kLauncherWidth, kLauncherHeight, false); } diff --git a/stella/src/gui/PromptWidget.cxx b/stella/src/gui/PromptWidget.cxx index 6c744380f..8baa71edd 100644 --- a/stella/src/gui/PromptWidget.cxx +++ b/stella/src/gui/PromptWidget.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: PromptWidget.cxx,v 1.18 2005-06-25 06:54:20 urchlay Exp $ +// $Id: PromptWidget.cxx,v 1.19 2005-06-25 17:26:32 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -79,7 +79,7 @@ PromptWidget::PromptWidget(GuiObject* boss, int x, int y, int w, int h) _promptStartPos = _promptEndPos = -1; // Display greetings & prompt - string version = string("Stella version ") + STELLA_VERSION + "\n"; + string version = string("Stella ") + STELLA_VERSION + "\n"; print(version.c_str()); print("Debugger is ready\n"); //print( instance()->debugger().state() + "\n"); // FIXME: this doesn't work yet