[Scummvm-cvs-logs] SF.net SVN: scummvm: [31294] scummvm/trunk/engines/kyra

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Fri Mar 28 16:29:39 CET 2008


Revision: 31294
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31294&view=rev
Author:   lordhoto
Date:     2008-03-28 08:29:39 -0700 (Fri, 28 Mar 2008)

Log Message:
-----------
- fixed svn properties
- reenabled kyra1 layout calculation

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui_v1.cpp
    scummvm/trunk/engines/kyra/gui_v1.h

Property Changed:
----------------
    scummvm/trunk/engines/kyra/gui.h
    scummvm/trunk/engines/kyra/gui_v1.h


Property changes on: scummvm/trunk/engines/kyra/gui.h
___________________________________________________________________
Name: svn:keywords
   - "Date Rev Author URL Id"
   + Date Rev Author URL Id

Modified: scummvm/trunk/engines/kyra/gui_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_v1.cpp	2008-03-28 12:45:26 UTC (rev 31293)
+++ scummvm/trunk/engines/kyra/gui_v1.cpp	2008-03-28 15:29:39 UTC (rev 31294)
@@ -472,8 +472,8 @@
 	return 0;
 }
 
-/*void KyraEngine_v1::initMenuLayout(Menu &menu) {
-	assert(menu.nrOfItems < 7);
+void GUI_v1::initMenuLayout(Menu &menu) {
+	assert(menu.numberOfItems < 7);
 
 	int widthBackup = _screen->_charWidth;
 	_screen->_charWidth = -2;
@@ -484,9 +484,11 @@
 	int maxOffset = 0;
 	int x1, x2, y1, y2;
 
-	for (int i = 0; i < menu.nrOfItems; i++) {
+	for (int i = 0; i < menu.numberOfItems; i++) {
 		if (menu.item[i].x == -1)
 			menu.item[i].x = (menu.width - menu.item[i].width)/2;
+		if (menu.item[i].y == -1)
+			menu.item[i].y = (menu.height - menu.item[i].height)/2;
 
 		if (menu.item[i].labelString) {
 			x1 = menu.x + menu.item[i].x + 25;
@@ -520,7 +522,7 @@
 
 	if (maxOffset > 0) {
 		maxOffset = maxOffset/2;
-		for (int i = 0; i < menu.nrOfItems; i++) {
+		for (int i = 0; i < menu.numberOfItems; i++) {
 			menu.item[i].x += maxOffset + 10;
 			menu.item[i].labelX -= maxOffset;
 		}
@@ -542,7 +544,7 @@
 		menu.y = (200 - menu.height)/2;
 
 	_screen->_charWidth = widthBackup;
-}*/
+}
 
 void GUI_v1::getInput() {
 	Common::Event event;

Modified: scummvm/trunk/engines/kyra/gui_v1.h
===================================================================
--- scummvm/trunk/engines/kyra/gui_v1.h	2008-03-28 12:45:26 UTC (rev 31293)
+++ scummvm/trunk/engines/kyra/gui_v1.h	2008-03-28 15:29:39 UTC (rev 31294)
@@ -96,6 +96,8 @@
 	int processButtonList(Button *buttonList, uint16 inputFlags);
 
 	int buttonMenuCallback(Button *caller);
+
+	void initMenuLayout(Menu &menu);
 private:
 	void initStaticResource();
 


Property changes on: scummvm/trunk/engines/kyra/gui_v1.h
___________________________________________________________________
Name: svn:keywords
   - "Date Rev Author URL Id"
   + Date Rev Author URL Id


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