[Scummvm-cvs-logs] SF.net SVN: scummvm: [25070] scummvm/trunk/engines/agi
darkfiber at users.sourceforge.net
darkfiber at users.sourceforge.net
Fri Jan 12 03:31:05 CET 2007
Revision: 25070
http://scummvm.svn.sourceforge.net/scummvm/?rev=25070&view=rev
Author: darkfiber
Date: 2007-01-11 18:31:04 -0800 (Thu, 11 Jan 2007)
Log Message:
-----------
Fixed version number printing in alt-d dialogue box
Modified Paths:
--------------
scummvm/trunk/engines/agi/agi.cpp
scummvm/trunk/engines/agi/agi.h
scummvm/trunk/engines/agi/op_cmd.cpp
Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp 2007-01-12 02:29:20 UTC (rev 25069)
+++ scummvm/trunk/engines/agi/agi.cpp 2007-01-12 02:31:04 UTC (rev 25070)
@@ -30,6 +30,7 @@
#include "common/config-manager.h"
#include "base/plugins.h"
+#include "base/version.h"
#include "graphics/cursorman.h"
@@ -656,7 +657,7 @@
int AgiEngine::go() {
CursorMan.showMouse(true);
- report(" \nAGI engine " VERSION " is ready.\n");
+ report(" \nAGI engine %s is ready.\n", gScummVMVersion);
if (game.state < STATE_LOADED) {
do {
main_cycle();
Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h 2007-01-12 02:29:20 UTC (rev 25069)
+++ scummvm/trunk/engines/agi/agi.h 2007-01-12 02:31:04 UTC (rev 25070)
@@ -44,7 +44,6 @@
/*
* Version and other definitions
*/
-#define VERSION __DATE__ " " __TIME__
#define USE_IIGS_SOUND
Modified: scummvm/trunk/engines/agi/op_cmd.cpp
===================================================================
--- scummvm/trunk/engines/agi/op_cmd.cpp 2007-01-12 02:29:20 UTC (rev 25069)
+++ scummvm/trunk/engines/agi/op_cmd.cpp 2007-01-12 02:31:04 UTC (rev 25070)
@@ -23,6 +23,7 @@
*/
#include "common/stdafx.h"
+#include "base/version.h"
#include "agi/agi.h"
#include "agi/sprite.h"
@@ -892,11 +893,11 @@
}
cmd(version) {
- char ver_msg[] = TITLE " v" VERSION;
+ char ver_msg[64];
char ver2_msg[] =
"\n"
- " \n\n"
- "Emulating Sierra AGI v%x.%03x\n";
+ " \n\n"
+ " Emulating Sierra AGI v%x.%03x\n";
char ver3_msg[] =
"\n"
" \n\n"
@@ -905,7 +906,11 @@
char *r, *q;
int ver, maj, min;
char msg[256];
+ int gap;
+ int len;
+ sprintf(ver_msg, TITLE " v%s", gScummVMVersion);
+
ver = g_agi->agiGetRelease();
maj = (ver >> 12) & 0xf;
min = ver & 0xfff;
@@ -913,7 +918,15 @@
q = maj == 2 ? ver2_msg : ver3_msg;
r = strchr(q + 1, '\n');
- strncpy(q + 1 + ((r - q > 0 ? r - q : 1) / 4), ver_msg, strlen(ver_msg));
+ /* insert our version into the other version */
+ len = strlen(ver_msg);
+ gap = r - q;
+ if(gap < 0)
+ gap = 0;
+ else
+ gap = (gap - len) / 2;
+
+ strncpy(q + 1 + gap, ver_msg, strlen(ver_msg));
sprintf(msg, q, maj, min);
g_agi->message_box(msg);
}
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